From 06f39f6af67b8466af4fcf05db2f33453ae44aac Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 21 Mar 2015 07:35:40 -0600 Subject: [PATCH] Maple: Rename files for better conformance to standards --- configs/maple/src/Makefile | 30 +++++++++---------- configs/maple/src/{up_boot.c => stm32_boot.c} | 2 +- configs/maple/src/{up_lcd.c => stm32_lcd.c} | 2 +- configs/maple/src/{up_leds.c => stm32_leds.c} | 2 +- configs/maple/src/{up_spi.c => stm32_spi.c} | 2 +- .../maple/src/{up_usbdev.c => stm32_usbdev.c} | 2 +- .../src/{up_watchdog.c => stm32_watchdog.c} | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) rename configs/maple/src/{up_boot.c => stm32_boot.c} (99%) rename configs/maple/src/{up_lcd.c => stm32_lcd.c} (99%) rename configs/maple/src/{up_leds.c => stm32_leds.c} (99%) rename configs/maple/src/{up_spi.c => stm32_spi.c} (99%) rename configs/maple/src/{up_usbdev.c => stm32_usbdev.c} (99%) rename configs/maple/src/{up_watchdog.c => stm32_watchdog.c} (99%) diff --git a/configs/maple/src/Makefile b/configs/maple/src/Makefile index 545f9caee8..18a3e3eb05 100644 --- a/configs/maple/src/Makefile +++ b/configs/maple/src/Makefile @@ -36,15 +36,15 @@ -include $(TOPDIR)/Make.defs -CFLAGS += -I$(TOPDIR)/sched +CFLAGS += -I$(TOPDIR)/sched -ASRCS = -AOBJS = $(ASRCS:.S=$(OBJEXT)) +ASRCS = +AOBJS = $(ASRCS:.S=$(OBJEXT)) -CSRCS = up_boot.c up_leds.c up_usbdev.c up_spi.c +CSRCS = stm32_boot.c stm32_leds.c stm32_usbdev.c stm32_spi.c ifeq ($(CONFIG_NX_LCDDRIVER),y) -CSRCS += up_lcd.c +CSRCS += stm32_lcd.c endif ifeq ($(CONFIG_NSH_ARCHINIT),y) @@ -57,21 +57,21 @@ ifeq ($(CONFIG_USBMSC),y) endif ifeq ($(CONFIG_WATCHDOG),y) - CSRCS += up_watchdog.c +CSRCS += stm32_watchdog.c endif -COBJS = $(CSRCS:.c=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) -SRCS = $(ASRCS) $(CSRCS) -OBJS = $(AOBJS) $(COBJS) +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) -ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src +ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src ifeq ($(WINTOOL),y) - CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \ - -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \ - -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}" - else - CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m + CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \ + -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \ + -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}" +else + CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m endif all: libboard$(LIBEXT) diff --git a/configs/maple/src/up_boot.c b/configs/maple/src/stm32_boot.c similarity index 99% rename from configs/maple/src/up_boot.c rename to configs/maple/src/stm32_boot.c index 12b136cf87..e22e005c77 100644 --- a/configs/maple/src/up_boot.c +++ b/configs/maple/src/stm32_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/maple/src/up_boot.c + * configs/maple/src/stm32_boot.c * * Copyright (C) 2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/maple/src/up_lcd.c b/configs/maple/src/stm32_lcd.c similarity index 99% rename from configs/maple/src/up_lcd.c rename to configs/maple/src/stm32_lcd.c index feb2845613..d00edea2c5 100644 --- a/configs/maple/src/up_lcd.c +++ b/configs/maple/src/stm32_lcd.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/maple/src/up_lcd.c + * configs/maple/src/stm32_lcd.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/maple/src/up_leds.c b/configs/maple/src/stm32_leds.c similarity index 99% rename from configs/maple/src/up_leds.c rename to configs/maple/src/stm32_leds.c index bc7426db1c..0bfab90ae2 100644 --- a/configs/maple/src/up_leds.c +++ b/configs/maple/src/stm32_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/maple/src/up_leds.c + * configs/maple/src/stm32_leds.c * * Copyright (C) 2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/maple/src/up_spi.c b/configs/maple/src/stm32_spi.c similarity index 99% rename from configs/maple/src/up_spi.c rename to configs/maple/src/stm32_spi.c index 29c96aa04e..897b6c7e36 100644 --- a/configs/maple/src/up_spi.c +++ b/configs/maple/src/stm32_spi.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/maple/src/up_spi.c + * configs/maple/src/stm32_spi.c * * Copyright (C) 2009, 2011-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/maple/src/up_usbdev.c b/configs/maple/src/stm32_usbdev.c similarity index 99% rename from configs/maple/src/up_usbdev.c rename to configs/maple/src/stm32_usbdev.c index cc10cece43..4730934393 100644 --- a/configs/maple/src/up_usbdev.c +++ b/configs/maple/src/stm32_usbdev.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/maple/src/up_usbdev.c + * configs/maple/src/stm32_usbdev.c * * Copyright (C) 2009-2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/maple/src/up_watchdog.c b/configs/maple/src/stm32_watchdog.c similarity index 99% rename from configs/maple/src/up_watchdog.c rename to configs/maple/src/stm32_watchdog.c index c587fe69da..9110efac49 100644 --- a/configs/maple/src/up_watchdog.c +++ b/configs/maple/src/stm32_watchdog.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/maple/src/up_watchdog.c + * configs/maple/src/stm32_watchdog.c * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt