diff --git a/configs/shenzhou/src/Makefile b/configs/shenzhou/src/Makefile index 888e470d718..75f839b279a 100644 --- a/configs/shenzhou/src/Makefile +++ b/configs/shenzhou/src/Makefile @@ -35,87 +35,87 @@ -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_spi.c up_mmcsd.c up_chipid.c +CSRCS = stm32_boot.c stm32_spi.c stm32_mmcsd.c stm32_chipid.c ifeq ($(CONFIG_HAVE_CXX),y) -CSRCS += up_cxxinitialize.c +CSRCS += stm32_cxxinitialize.c endif ifeq ($(CONFIG_ARCH_LEDS),y) -CSRCS += up_autoleds.c +CSRCS += stm32_autoleds.c else -CSRCS += up_userleds.c +CSRCS += stm32_userleds.c endif ifeq ($(CONFIG_ARCH_BUTTONS),y) -CSRCS += up_buttons.c +CSRCS += stm32_buttons.c endif ifeq ($(CONFIG_ARCH_RELAYS),y) -CSRCS += up_relays.c +CSRCS += stm32_relays.c endif ifeq ($(CONFIG_STM32_OTGFS),y) -CSRCS += up_usb.c +CSRCS += stm32_usb.c endif ifeq ($(CONFIG_NSH_ARCHINIT),y) -CSRCS += up_nsh.c +CSRCS += stm32_nsh.c endif ifeq ($(CONFIG_MTD_W25),y) -CSRCS += up_w25.c +CSRCS += stm32_w25.c endif ifeq ($(CONFIG_USBMSC),y) -CSRCS += up_usbmsc.c +CSRCS += stm32_usbmsc.c endif ifeq ($(CONFIG_USBDEV_COMPOSITE),y) -CSRCS += up_composite.c +CSRCS += stm32_composite.c endif ifeq ($(CONFIG_CAN),y) -CSRCS += up_can.c +CSRCS += stm32_can.c endif ifeq ($(CONFIG_ADC),y) -CSRCS += up_adc.c +CSRCS += stm32_adc.c endif ifeq ($(CONFIG_WATCHDOG),y) -CSRCS += up_watchdog.c +CSRCS += stm32_watchdog.c endif # NOTE: SSD1289 is not supported on the board ifeq ($(CONFIG_LCD_SSD1289),y) -CSRCS += up_ssd1289.c +CSRCS += stm32_ssd1289.c else -CSRCS += up_ili93xx.c +CSRCS += stm32_ili93xx.c endif ifeq ($(CONFIG_INPUT_ADS7843E),y) -CSRCS += up_touchscreen.c +CSRCS += stm32_touchscreen.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}" + 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$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m endif all: libboard$(LIBEXT) diff --git a/configs/shenzhou/src/shenzhou-internal.h b/configs/shenzhou/src/shenzhou-internal.h index 35b6a27eb0a..9c76eaa859f 100644 --- a/configs/shenzhou/src/shenzhou-internal.h +++ b/configs/shenzhou/src/shenzhou-internal.h @@ -1,6 +1,5 @@ /**************************************************************************************************** * configs/shenzhou/src/shenzhou-internal.h - * arch/arm/src/board/shenzhou-internal.n * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -46,7 +45,7 @@ #include /**************************************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************************************/ /* Configuration ************************************************************************************/ /* How many SPI modules does this chip support? */ diff --git a/configs/shenzhou/src/up_adc.c b/configs/shenzhou/src/stm32_adc.c similarity index 98% rename from configs/shenzhou/src/up_adc.c rename to configs/shenzhou/src/stm32_adc.c index e62289ca645..ee806a993ed 100644 --- a/configs/shenzhou/src/up_adc.c +++ b/configs/shenzhou/src/stm32_adc.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/shenzhou/src/up_adc.c - * arch/arm/src/board/up_adc.c + * configs/shenzhou/src/stm32_adc.c * * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -55,7 +54,7 @@ #ifdef CONFIG_ADC /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* Configuration ********************************************************************/ /* Up to 3 ADC interfaces are supported */ diff --git a/configs/shenzhou/src/up_autoleds.c b/configs/shenzhou/src/stm32_autoleds.c similarity index 99% rename from configs/shenzhou/src/up_autoleds.c rename to configs/shenzhou/src/stm32_autoleds.c index b0093ed73c2..06b92ea37a6 100644 --- a/configs/shenzhou/src/up_autoleds.c +++ b/configs/shenzhou/src/stm32_autoleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/shenzhou/src/up_autoleds.c + * configs/shenzhou/src/stm32_autoleds.c * * Copyright (C) 2012-2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/shenzhou/src/up_boot.c b/configs/shenzhou/src/stm32_boot.c similarity index 99% rename from configs/shenzhou/src/up_boot.c rename to configs/shenzhou/src/stm32_boot.c index 0a1fa71807c..6e922949ce3 100644 --- a/configs/shenzhou/src/up_boot.c +++ b/configs/shenzhou/src/stm32_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/shenzhou/src/up_boot.c + * configs/shenzhou/src/stm32_boot.c * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/shenzhou/src/up_buttons.c b/configs/shenzhou/src/stm32_buttons.c similarity index 99% rename from configs/shenzhou/src/up_buttons.c rename to configs/shenzhou/src/stm32_buttons.c index 6bdae91e37a..b4632d8c698 100644 --- a/configs/shenzhou/src/up_buttons.c +++ b/configs/shenzhou/src/stm32_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/shenzhou/src/board_buttons.c + * configs/shenzhou/src/stm32_buttons.c * * Copyright (C) 2012, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/shenzhou/src/up_can.c b/configs/shenzhou/src/stm32_can.c similarity index 99% rename from configs/shenzhou/src/up_can.c rename to configs/shenzhou/src/stm32_can.c index 6b09be7ca87..0c888f7c8b6 100644 --- a/configs/shenzhou/src/up_can.c +++ b/configs/shenzhou/src/stm32_can.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/shenzhou/src/up_can.c + * configs/shenzhou/src/stm32_can.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/shenzhou/src/up_chipid.c b/configs/shenzhou/src/stm32_chipid.c similarity index 97% rename from configs/shenzhou/src/up_chipid.c rename to configs/shenzhou/src/stm32_chipid.c index e2978e54a90..07d597f043d 100644 --- a/configs/shenzhou/src/up_chipid.c +++ b/configs/shenzhou/src/stm32_chipid.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/shenzhou/src/up_chipid.c - * arch/arm/src/board/up_chipid.c + * configs/shenzhou/src/stm32_chipid.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -47,7 +46,7 @@ #include "up_arch.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /************************************************************************************ diff --git a/configs/shenzhou/src/up_composite.c b/configs/shenzhou/src/stm32_composite.c similarity index 97% rename from configs/shenzhou/src/up_composite.c rename to configs/shenzhou/src/stm32_composite.c index 53f6c46ecec..97fe9fca792 100644 --- a/configs/shenzhou/src/up_composite.c +++ b/configs/shenzhou/src/stm32_composite.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/shenzhou/src/up_composite.c + * configs/shenzhou/src/stm32_composite.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -46,7 +46,7 @@ #include "shenzhou-internal.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ /* Device minor number */ diff --git a/configs/shenzhou/src/up_cxxinitialize.c b/configs/shenzhou/src/stm32_cxxinitialize.c similarity index 98% rename from configs/shenzhou/src/up_cxxinitialize.c rename to configs/shenzhou/src/stm32_cxxinitialize.c index 406827dbf83..3eeab04e544 100644 --- a/configs/shenzhou/src/up_cxxinitialize.c +++ b/configs/shenzhou/src/stm32_cxxinitialize.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/shenzhou/src/up_cxxinitialize.c - * arch/arm/src/board/up_cxxinitialize.c + * configs/shenzhou/src/stm32_cxxinitialize.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -50,7 +49,7 @@ #if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE) /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* Debug ****************************************************************************/ /* Non-standard debug that may be enabled just for testing the static constructors */ diff --git a/configs/shenzhou/src/up_ili93xx.c b/configs/shenzhou/src/stm32_ili93xx.c similarity index 99% rename from configs/shenzhou/src/up_ili93xx.c rename to configs/shenzhou/src/stm32_ili93xx.c index 84395b6b7eb..3da0df25378 100644 --- a/configs/shenzhou/src/up_ili93xx.c +++ b/configs/shenzhou/src/stm32_ili93xx.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/shenzhou/src/up_ili93xx.c - * arch/arm/src/board/up_ili93xx.c + * configs/shenzhou/src/stm32_ili93xx.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt diff --git a/configs/shenzhou/src/up_mmcsd.c b/configs/shenzhou/src/stm32_mmcsd.c similarity index 97% rename from configs/shenzhou/src/up_mmcsd.c rename to configs/shenzhou/src/stm32_mmcsd.c index a4416af56b5..043951e7fb4 100644 --- a/configs/shenzhou/src/up_mmcsd.c +++ b/configs/shenzhou/src/stm32_mmcsd.c @@ -1,6 +1,5 @@ /**************************************************************************** - * config/shenzhou/src/up_mmcsd.c - * arch/arm/src/board/up_mmcsd.c + * config/shenzhou/src/stm32_mmcsd.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -48,7 +47,7 @@ #include /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ /* SPI1 connects to the SD CARD (and to the SPI FLASH) */ diff --git a/configs/shenzhou/src/up_nsh.c b/configs/shenzhou/src/stm32_nsh.c similarity index 98% rename from configs/shenzhou/src/up_nsh.c rename to configs/shenzhou/src/stm32_nsh.c index 2e8726f51a7..aebe0046121 100644 --- a/configs/shenzhou/src/up_nsh.c +++ b/configs/shenzhou/src/stm32_nsh.c @@ -1,6 +1,5 @@ /**************************************************************************** - * config/shenzhou/src/up_nsh.c - * arch/arm/src/board/up_nsh.c + * config/shenzhou/src/stm32_nsh.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -49,7 +48,7 @@ #include "shenzhou-internal.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/shenzhou/src/up_relays.c b/configs/shenzhou/src/stm32_relays.c similarity index 99% rename from configs/shenzhou/src/up_relays.c rename to configs/shenzhou/src/stm32_relays.c index 6916ee455fd..72c4793d221 100644 --- a/configs/shenzhou/src/up_relays.c +++ b/configs/shenzhou/src/stm32_relays.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/shenzhou/src/up_relays.c + * configs/shenzhou/src/stm32_relays.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/shenzhou/src/up_spi.c b/configs/shenzhou/src/stm32_spi.c similarity index 98% rename from configs/shenzhou/src/up_spi.c rename to configs/shenzhou/src/stm32_spi.c index 2a633cebd1a..2031d4d21ee 100644 --- a/configs/shenzhou/src/up_spi.c +++ b/configs/shenzhou/src/stm32_spi.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/shenzhou/src/up_spi.c - * arch/arm/src/board/up_spi.c + * configs/shenzhou/src/stm32_spi.c * * Copyright (C) 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -55,7 +54,7 @@ #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI3) /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* Enables debug output from this file (needs CONFIG_DEBUG too) */ diff --git a/configs/shenzhou/src/up_ssd1289.c b/configs/shenzhou/src/stm32_ssd1289.c similarity index 99% rename from configs/shenzhou/src/up_ssd1289.c rename to configs/shenzhou/src/stm32_ssd1289.c index ed30bebd3d4..1558201e1b2 100644 --- a/configs/shenzhou/src/up_ssd1289.c +++ b/configs/shenzhou/src/stm32_ssd1289.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/shenzhou/src/up_ssd1289.c - * arch/arm/src/board/up_ssd1289.c + * configs/shenzhou/src/stm32_ssd1289.c * * This logic supports the connection of an SSD1289-based LCD to the Shenzhou IV * board. diff --git a/configs/shenzhou/src/up_touchscreen.c b/configs/shenzhou/src/stm32_touchscreen.c similarity index 98% rename from configs/shenzhou/src/up_touchscreen.c rename to configs/shenzhou/src/stm32_touchscreen.c index 832b48515df..5128733ef75 100644 --- a/configs/shenzhou/src/up_touchscreen.c +++ b/configs/shenzhou/src/stm32_touchscreen.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/shenzhou/src/up_touchscreen.c - * arch/arm/src/board/up_touchscreen.c + * configs/shenzhou/src/stm32_touchscreen.c * * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -55,7 +54,7 @@ #include "shenzhou-internal.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/shenzhou/src/up_usb.c b/configs/shenzhou/src/stm32_usb.c similarity index 99% rename from configs/shenzhou/src/up_usb.c rename to configs/shenzhou/src/stm32_usb.c index c9ae8e4b976..ef7e86451f2 100644 --- a/configs/shenzhou/src/up_usb.c +++ b/configs/shenzhou/src/stm32_usb.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/shenzhou/src/up_usbdev.c - * arch/arm/src/board/up_boot.c + * configs/shenzhou/src/stm32_usb.c * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/shenzhou/src/up_usbmsc.c b/configs/shenzhou/src/stm32_usbmsc.c similarity index 97% rename from configs/shenzhou/src/up_usbmsc.c rename to configs/shenzhou/src/stm32_usbmsc.c index fe6b4fbc177..6f4ea9cafd2 100644 --- a/configs/shenzhou/src/up_usbmsc.c +++ b/configs/shenzhou/src/stm32_usbmsc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/shenzhou/src/up_usbmsc.c + * configs/shenzhou/src/stm32_usbmsc.c * * Copyright (C) 2012, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -48,7 +48,7 @@ #include "stm32.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/shenzhou/src/up_userleds.c b/configs/shenzhou/src/stm32_userleds.c similarity index 98% rename from configs/shenzhou/src/up_userleds.c rename to configs/shenzhou/src/stm32_userleds.c index 0fc83fd1e31..f537462d79a 100644 --- a/configs/shenzhou/src/up_userleds.c +++ b/configs/shenzhou/src/stm32_userleds.c @@ -1,6 +1,5 @@ /**************************************************************************** - * configs/shenzhou/src/up_userleds.c - * arch/arm/src/board/up_userleds.c + * configs/shenzhou/src/stm32_userleds.c * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -55,7 +54,7 @@ #ifndef CONFIG_ARCH_LEDS /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG diff --git a/configs/shenzhou/src/up_w25.c b/configs/shenzhou/src/stm32_w25.c similarity index 98% rename from configs/shenzhou/src/up_w25.c rename to configs/shenzhou/src/stm32_w25.c index 6dcfe093af0..1ffbf5c110d 100644 --- a/configs/shenzhou/src/up_w25.c +++ b/configs/shenzhou/src/stm32_w25.c @@ -1,6 +1,5 @@ /**************************************************************************** - * config/shenzhou/src/up_w25.c - * arch/arm/src/board/up_w25.c + * config/shenzhou/src/stm32_w25.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -56,7 +55,7 @@ #include "shenzhou-internal.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/shenzhou/src/up_watchdog.c b/configs/shenzhou/src/stm32_watchdog.c similarity index 98% rename from configs/shenzhou/src/up_watchdog.c rename to configs/shenzhou/src/stm32_watchdog.c index a4be02371db..8c689f0a9a0 100644 --- a/configs/shenzhou/src/up_watchdog.c +++ b/configs/shenzhou/src/stm32_watchdog.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/shenzhou/src/up_watchdog.c - * arch/arm/src/board/up_watchdog.c + * configs/shenzhou/src/stm32_watchdog.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -51,7 +50,7 @@ #ifdef CONFIG_WATCHDOG /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* Configuration *******************************************************************/ /* Wathdog hardware should be enabled */