diff --git a/configs/cloudctrl/src/Makefile b/configs/cloudctrl/src/Makefile index 248886fc31..f2036f024d 100644 --- a/configs/cloudctrl/src/Makefile +++ b/configs/cloudctrl/src/Makefile @@ -36,71 +36,71 @@ -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_chipid.c +CSRCS = stm32_boot.c stm32_spi.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_ADC),y) -CSRCS += up_adc.c +CSRCS += stm32_adc.c endif ifeq ($(CONFIG_WATCHDOG),y) -CSRCS += up_watchdog.c +CSRCS += stm32_watchdog.c endif ifeq ($(CONFIG_STM32_PHYINIT),y) -CSRCS += up_phyinit.c +CSRCS += stm32_phyinit.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/cloudctrl/src/cloudctrl-internal.h b/configs/cloudctrl/src/cloudctrl-internal.h index b31b873d86..a064c7f0cd 100644 --- a/configs/cloudctrl/src/cloudctrl-internal.h +++ b/configs/cloudctrl/src/cloudctrl-internal.h @@ -47,7 +47,7 @@ #include /**************************************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************************************/ /* Configuration ************************************************************************************/ /* How many SPI modules does this chip support? */ diff --git a/configs/cloudctrl/src/up_adc.c b/configs/cloudctrl/src/stm32_adc.c similarity index 98% rename from configs/cloudctrl/src/up_adc.c rename to configs/cloudctrl/src/stm32_adc.c index f66dee35d0..d78497fecd 100644 --- a/configs/cloudctrl/src/up_adc.c +++ b/configs/cloudctrl/src/stm32_adc.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/cloudctrl/src/up_adc.c - * arch/arm/src/board/up_adc.c + * configs/cloudctrl/src/stm32_adc.c * * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -56,7 +55,7 @@ #ifdef CONFIG_ADC /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* Configuration ********************************************************************/ /* Up to 3 ADC interfaces are supported */ diff --git a/configs/cloudctrl/src/up_autoleds.c b/configs/cloudctrl/src/stm32_autoleds.c similarity index 99% rename from configs/cloudctrl/src/up_autoleds.c rename to configs/cloudctrl/src/stm32_autoleds.c index 3f6a830764..b06a5b56ee 100644 --- a/configs/cloudctrl/src/up_autoleds.c +++ b/configs/cloudctrl/src/stm32_autoleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/cloudctrl/src/up_autoleds.c + * configs/cloudctrl/src/stm32_autoleds.c * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/cloudctrl/src/up_boot.c b/configs/cloudctrl/src/stm32_boot.c similarity index 99% rename from configs/cloudctrl/src/up_boot.c rename to configs/cloudctrl/src/stm32_boot.c index 44b716839d..567e98f49e 100644 --- a/configs/cloudctrl/src/up_boot.c +++ b/configs/cloudctrl/src/stm32_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/cloudctrl/src/up_boot.c + * configs/cloudctrl/src/stm32_boot.c * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/cloudctrl/src/up_buttons.c b/configs/cloudctrl/src/stm32_buttons.c similarity index 99% rename from configs/cloudctrl/src/up_buttons.c rename to configs/cloudctrl/src/stm32_buttons.c index 5b43dd159d..906eb2f591 100644 --- a/configs/cloudctrl/src/up_buttons.c +++ b/configs/cloudctrl/src/stm32_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/cloudctrl/src/board_buttons.c + * configs/cloudctrl/src/stm32_buttons.c * * Copyright (C) 2012, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/cloudctrl/src/up_chipid.c b/configs/cloudctrl/src/stm32_chipid.c similarity index 97% rename from configs/cloudctrl/src/up_chipid.c rename to configs/cloudctrl/src/stm32_chipid.c index 55018edd46..957804c8d7 100644 --- a/configs/cloudctrl/src/up_chipid.c +++ b/configs/cloudctrl/src/stm32_chipid.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/cloudctrl/src/up_chipid.c - * arch/arm/src/board/up_chipid.c + * configs/cloudctrl/src/stm32_chipid.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -48,7 +47,7 @@ #include "up_arch.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /************************************************************************************ diff --git a/configs/cloudctrl/src/up_cxxinitialize.c b/configs/cloudctrl/src/stm32_cxxinitialize.c similarity index 98% rename from configs/cloudctrl/src/up_cxxinitialize.c rename to configs/cloudctrl/src/stm32_cxxinitialize.c index 8f01ba5335..aa472bae06 100644 --- a/configs/cloudctrl/src/up_cxxinitialize.c +++ b/configs/cloudctrl/src/stm32_cxxinitialize.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/cloudctrl/src/up_cxxinitialize.c - * arch/arm/src/board/up_cxxinitialize.c + * configs/cloudctrl/src/stm32_cxxinitialize.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -51,7 +50,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/cloudctrl/src/up_nsh.c b/configs/cloudctrl/src/stm32_nsh.c similarity index 97% rename from configs/cloudctrl/src/up_nsh.c rename to configs/cloudctrl/src/stm32_nsh.c index 9754b60f81..61964d4414 100644 --- a/configs/cloudctrl/src/up_nsh.c +++ b/configs/cloudctrl/src/stm32_nsh.c @@ -1,6 +1,5 @@ /**************************************************************************** - * config/cloudctrl/src/up_nsh.c - * arch/arm/src/board/up_nsh.c + * config/cloudctrl/src/stm32_nsh.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -50,7 +49,7 @@ #include "cloudctrl-internal.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/cloudctrl/src/up_phyinit.c b/configs/cloudctrl/src/stm32_phyinit.c similarity index 97% rename from configs/cloudctrl/src/up_phyinit.c rename to configs/cloudctrl/src/stm32_phyinit.c index 9fe89f3194..8646447ddf 100644 --- a/configs/cloudctrl/src/up_phyinit.c +++ b/configs/cloudctrl/src/stm32_phyinit.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/cloudctrl/src/up_phyinit.c - * arch/arm/src/board/up_phyinit.c + * configs/cloudctrl/src/stm32_phyinit.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -47,7 +46,7 @@ #include "cloudctrl-internal.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /************************************************************************************ diff --git a/configs/cloudctrl/src/up_relays.c b/configs/cloudctrl/src/stm32_relays.c similarity index 99% rename from configs/cloudctrl/src/up_relays.c rename to configs/cloudctrl/src/stm32_relays.c index 60630dd8af..5bd65df094 100644 --- a/configs/cloudctrl/src/up_relays.c +++ b/configs/cloudctrl/src/stm32_relays.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/cloudctrl/src/up_relays.c + * configs/cloudctrl/src/stm32_relays.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/cloudctrl/src/up_spi.c b/configs/cloudctrl/src/stm32_spi.c similarity index 98% rename from configs/cloudctrl/src/up_spi.c rename to configs/cloudctrl/src/stm32_spi.c index f8bdef42dd..22500c2996 100644 --- a/configs/cloudctrl/src/up_spi.c +++ b/configs/cloudctrl/src/stm32_spi.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/cloudctrl/src/up_spi.c - * arch/arm/src/board/up_spi.c + * configs/cloudctrl/src/stm32_spi.c * * Copyright (C) 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -56,7 +55,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/cloudctrl/src/up_usb.c b/configs/cloudctrl/src/stm32_usb.c similarity index 99% rename from configs/cloudctrl/src/up_usb.c rename to configs/cloudctrl/src/stm32_usb.c index 77b79db2f9..9a08e6960c 100644 --- a/configs/cloudctrl/src/up_usb.c +++ b/configs/cloudctrl/src/stm32_usb.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/cloudctrl/src/up_usbdev.c - * arch/arm/src/board/up_boot.c + * configs/cloudctrl/src/stm32_usb.c * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/cloudctrl/src/up_usbmsc.c b/configs/cloudctrl/src/stm32_usbmsc.c similarity index 97% rename from configs/cloudctrl/src/up_usbmsc.c rename to configs/cloudctrl/src/stm32_usbmsc.c index 5c9481b8f3..15641387b9 100644 --- a/configs/cloudctrl/src/up_usbmsc.c +++ b/configs/cloudctrl/src/stm32_usbmsc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/cloudctrl/src/up_usbmsc.c + * configs/cloudctrl/src/stm32_usbmsc.c * * Copyright (C) 2012, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -49,7 +49,7 @@ #include "stm32.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/cloudctrl/src/up_userleds.c b/configs/cloudctrl/src/stm32_userleds.c similarity index 98% rename from configs/cloudctrl/src/up_userleds.c rename to configs/cloudctrl/src/stm32_userleds.c index cac8c50457..d68f450a5c 100644 --- a/configs/cloudctrl/src/up_userleds.c +++ b/configs/cloudctrl/src/stm32_userleds.c @@ -1,6 +1,5 @@ /**************************************************************************** - * configs/cloudctrl/src/up_userleds.c - * arch/arm/src/board/up_userleds.c + * configs/cloudctrl/src/stm32_userleds.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -56,7 +55,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/cloudctrl/src/up_w25.c b/configs/cloudctrl/src/stm32_w25.c similarity index 98% rename from configs/cloudctrl/src/up_w25.c rename to configs/cloudctrl/src/stm32_w25.c index b9e018a900..0b94726fa1 100644 --- a/configs/cloudctrl/src/up_w25.c +++ b/configs/cloudctrl/src/stm32_w25.c @@ -1,6 +1,5 @@ /**************************************************************************** - * config/cloudctrl/src/up_w25.c - * arch/arm/src/board/up_w25.c + * config/cloudctrl/src/stm32_w25.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -57,7 +56,7 @@ #include "cloudctrl-internal.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/cloudctrl/src/up_watchdog.c b/configs/cloudctrl/src/stm32_watchdog.c similarity index 98% rename from configs/cloudctrl/src/up_watchdog.c rename to configs/cloudctrl/src/stm32_watchdog.c index eaaeccd324..04a8b5fe27 100644 --- a/configs/cloudctrl/src/up_watchdog.c +++ b/configs/cloudctrl/src/stm32_watchdog.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/cloudctrl/src/up_watchdog.c - * arch/arm/src/board/up_watchdog.c + * configs/cloudctrl/src/stm32_watchdog.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -52,7 +51,7 @@ #ifdef CONFIG_WATCHDOG /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* Configuration *******************************************************************/ /* Wathdog hardware should be enabled */