diff --git a/configs/stm3220g-eval/src/Makefile b/configs/stm3220g-eval/src/Makefile index e7223993cb4..972e5d8a131 100644 --- a/configs/stm3220g-eval/src/Makefile +++ b/configs/stm3220g-eval/src/Makefile @@ -35,71 +35,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 +CSRCS = stm32_boot.c stm32_spi.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_STM32_OTGFS),y) -CSRCS += up_usb.c +CSRCS += stm32_usb.c endif ifeq ($(CONFIG_STM32_FSMC),y) -CSRCS += up_lcd.c up_selectlcd.c up_deselectlcd.c up_selectsram.c up_deselectsram.c up_extmem.c +CSRCS += stm32_lcd.c stm32_selectlcd.c stm32_deselectlcd.c stm32_selectsram.c stm32_deselectsram.c stm32_extmem.c endif ifeq ($(CONFIG_ADC),y) -CSRCS += up_adc.c +CSRCS += stm32_adc.c endif ifeq ($(CONFIG_PWM),y) -CSRCS += up_pwm.c +CSRCS += stm32_pwm.c endif ifeq ($(CONFIG_CAN),y) -CSRCS += up_can.c +CSRCS += stm32_can.c endif ifeq ($(CONFIG_NSH_ARCHINIT),y) -CSRCS += up_nsh.c +CSRCS += stm32_nsh.c endif ifeq ($(CONFIG_WATCHDOG),y) -CSRCS += up_watchdog.c +CSRCS += stm32_watchdog.c endif ifeq ($(CONFIG_INPUT_STMPE811),y) -CSRCS += up_stmpe811.c +CSRCS += stm32_stmpe811.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/stm3220g-eval/src/stm3220g-internal.h b/configs/stm3220g-eval/src/stm3220g-internal.h index 505c0bd38e1..e6a82f3880f 100644 --- a/configs/stm3220g-eval/src/stm3220g-internal.h +++ b/configs/stm3220g-eval/src/stm3220g-internal.h @@ -1,6 +1,5 @@ /**************************************************************************************************** * configs/stm3220g_eval/src/stm3220g_internal.h - * arch/arm/src/board/stm3220g_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/stm3220g-eval/src/up_adc.c b/configs/stm3220g-eval/src/stm32_adc.c similarity index 98% rename from configs/stm3220g-eval/src/up_adc.c rename to configs/stm3220g-eval/src/stm32_adc.c index 0b4d1e48cd0..6347f1cfe43 100644 --- a/configs/stm3220g-eval/src/up_adc.c +++ b/configs/stm3220g-eval/src/stm32_adc.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/stm3220g-eval/src/up_adc.c - * arch/arm/src/board/up_adc.c + * configs/stm3220g-eval/src/stm32_adc.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -55,7 +54,7 @@ #ifdef CONFIG_ADC /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* Configuration ************************************************************/ @@ -165,4 +164,4 @@ int adc_devinit(void) } #endif /* CONFIG_STM32_ADC1 || CONFIG_STM32_ADC2 || CONFIG_STM32_ADC3 */ -#endif /* CONFIG_ADC */ \ No newline at end of file +#endif /* CONFIG_ADC */ diff --git a/configs/stm3220g-eval/src/up_autoleds.c b/configs/stm3220g-eval/src/stm32_autoleds.c similarity index 99% rename from configs/stm3220g-eval/src/up_autoleds.c rename to configs/stm3220g-eval/src/stm32_autoleds.c index d994ed123eb..d63cfb85367 100644 --- a/configs/stm3220g-eval/src/up_autoleds.c +++ b/configs/stm3220g-eval/src/stm32_autoleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/stm3220g_eval/src/up_autoleds.c + * configs/stm3220g_eval/src/stm32_autoleds.c * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/stm3220g-eval/src/up_boot.c b/configs/stm3220g-eval/src/stm32_boot.c similarity index 98% rename from configs/stm3220g-eval/src/up_boot.c rename to configs/stm3220g-eval/src/stm32_boot.c index 7c0949c0859..4e20ea9f403 100644 --- a/configs/stm3220g-eval/src/up_boot.c +++ b/configs/stm3220g-eval/src/stm32_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/stm3220g-eval/src/up_boot.c + * configs/stm3220g-eval/src/stm32_boot.c * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/stm3220g-eval/src/up_buttons.c b/configs/stm3220g-eval/src/stm32_buttons.c similarity index 99% rename from configs/stm3220g-eval/src/up_buttons.c rename to configs/stm3220g-eval/src/stm32_buttons.c index 4b65e6f34c5..9a7bd4c0221 100644 --- a/configs/stm3220g-eval/src/up_buttons.c +++ b/configs/stm3220g-eval/src/stm32_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/stm3220g-eval/src/board_buttons.c + * configs/stm3220g-eval/src/stm32_buttons.c * * Copyright (C) 2012, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/stm3220g-eval/src/up_can.c b/configs/stm3220g-eval/src/stm32_can.c similarity index 98% rename from configs/stm3220g-eval/src/up_can.c rename to configs/stm3220g-eval/src/stm32_can.c index 72c8f67a1dd..e99e98ba488 100644 --- a/configs/stm3220g-eval/src/up_can.c +++ b/configs/stm3220g-eval/src/stm32_can.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/stm3220g-eval/src/up_can.c - * arch/arm/src/board/up_can.c + * configs/stm3220g-eval/src/stm32_can.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/stm3220g-eval/src/up_cxxinitialize.c b/configs/stm3220g-eval/src/stm32_cxxinitialize.c similarity index 98% rename from configs/stm3220g-eval/src/up_cxxinitialize.c rename to configs/stm3220g-eval/src/stm32_cxxinitialize.c index ad226f486fe..f5fa2452283 100644 --- a/configs/stm3220g-eval/src/up_cxxinitialize.c +++ b/configs/stm3220g-eval/src/stm32_cxxinitialize.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/stm3220g-eval/src/up_cxxinitialize.c - * arch/arm/src/board/up_cxxinitialize.c + * configs/stm3220g-eval/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/stm3220g-eval/src/up_deselectlcd.c b/configs/stm3220g-eval/src/stm32_deselectlcd.c similarity index 97% rename from configs/stm3220g-eval/src/up_deselectlcd.c rename to configs/stm3220g-eval/src/stm32_deselectlcd.c index 20e459bec55..f9fb2fa49db 100644 --- a/configs/stm3220g-eval/src/up_deselectlcd.c +++ b/configs/stm3220g-eval/src/stm32_deselectlcd.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/stm3220g-eval/src/up_deselectlcd.c - * arch/arm/src/board/up_deselectlcd.c + * configs/stm3220g-eval/src/stm32_deselectlcd.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt diff --git a/configs/stm3220g-eval/src/up_deselectsram.c b/configs/stm3220g-eval/src/stm32_deselectsram.c similarity index 97% rename from configs/stm3220g-eval/src/up_deselectsram.c rename to configs/stm3220g-eval/src/stm32_deselectsram.c index d0eb5d59ef4..eeee8aafabc 100644 --- a/configs/stm3220g-eval/src/up_deselectsram.c +++ b/configs/stm3220g-eval/src/stm32_deselectsram.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/stm3220g-eval/src/up_deselectsram.c - * arch/arm/src/board/up_deselectsram.c + * configs/stm3220g-eval/src/stm32_deselectsram.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/stm3220g-eval/src/up_extmem.c b/configs/stm3220g-eval/src/stm32_extmem.c similarity index 98% rename from configs/stm3220g-eval/src/up_extmem.c rename to configs/stm3220g-eval/src/stm32_extmem.c index d5984f35af7..0e24e4e4e6e 100644 --- a/configs/stm3220g-eval/src/up_extmem.c +++ b/configs/stm3220g-eval/src/stm32_extmem.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/stm3220g-eval/src/up_extmem.c - * arch/arm/src/board/up_extmem.c + * configs/stm3220g-eval/src/stm32_extmem.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/stm3220g-eval/src/up_lcd.c b/configs/stm3220g-eval/src/stm32_lcd.c similarity index 99% rename from configs/stm3220g-eval/src/up_lcd.c rename to configs/stm3220g-eval/src/stm32_lcd.c index 3592e8a8f83..39878b2966c 100644 --- a/configs/stm3220g-eval/src/up_lcd.c +++ b/configs/stm3220g-eval/src/stm32_lcd.c @@ -1,6 +1,5 @@ /************************************************************************************** - * configs/stm3220g-eval/src/up_lcd.c - * arch/arm/src/board/up_lcd.c + * configs/stm3220g-eval/src/stm32_lcd.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt diff --git a/configs/stm3220g-eval/src/up_nsh.c b/configs/stm3220g-eval/src/stm32_nsh.c similarity index 98% rename from configs/stm3220g-eval/src/up_nsh.c rename to configs/stm3220g-eval/src/stm32_nsh.c index 5a4e588e2e0..f150b5cd06c 100644 --- a/configs/stm3220g-eval/src/up_nsh.c +++ b/configs/stm3220g-eval/src/stm32_nsh.c @@ -1,6 +1,5 @@ /**************************************************************************** - * config/stm3220g_eval/src/up_nsh.c - * arch/arm/src/board/up_nsh.c + * config/stm3220g_eval/src/stm32_nsh.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -63,7 +62,7 @@ #include "stm3220g-internal.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/stm3220g-eval/src/up_pwm.c b/configs/stm3220g-eval/src/stm32_pwm.c similarity index 98% rename from configs/stm3220g-eval/src/up_pwm.c rename to configs/stm3220g-eval/src/stm32_pwm.c index dff7320379d..adbce846d13 100644 --- a/configs/stm3220g-eval/src/up_pwm.c +++ b/configs/stm3220g-eval/src/stm32_pwm.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/stm3220g-eval/src/up_pwm.c - * arch/arm/src/board/up_pwm.c + * configs/stm3220g-eval/src/stm32_pwm.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -52,7 +51,7 @@ #include "stm3220g-internal.h" /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* Configuration *******************************************************************/ /* PWM diff --git a/configs/stm3220g-eval/src/up_selectlcd.c b/configs/stm3220g-eval/src/stm32_selectlcd.c similarity index 98% rename from configs/stm3220g-eval/src/up_selectlcd.c rename to configs/stm3220g-eval/src/stm32_selectlcd.c index 4d23350dff1..67943bd32cd 100644 --- a/configs/stm3220g-eval/src/up_selectlcd.c +++ b/configs/stm3220g-eval/src/stm32_selectlcd.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/stm3220g-eval/src/up_selectlcd.c - * arch/arm/src/board/up_selectlcd.c + * configs/stm3220g-eval/src/stm32_selectlcd.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt diff --git a/configs/stm3220g-eval/src/up_selectsram.c b/configs/stm3220g-eval/src/stm32_selectsram.c similarity index 98% rename from configs/stm3220g-eval/src/up_selectsram.c rename to configs/stm3220g-eval/src/stm32_selectsram.c index c70d7008bcb..c9abfd5f033 100644 --- a/configs/stm3220g-eval/src/up_selectsram.c +++ b/configs/stm3220g-eval/src/stm32_selectsram.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/stm3220g-eval/src/up_selectsram.c - * arch/arm/src/board/up_selectsram.c + * configs/stm3220g-eval/src/stm32_selectsram.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/stm3220g-eval/src/up_spi.c b/configs/stm3220g-eval/src/stm32_spi.c similarity index 98% rename from configs/stm3220g-eval/src/up_spi.c rename to configs/stm3220g-eval/src/stm32_spi.c index 8d44ce0fd47..b0ecc6990e3 100644 --- a/configs/stm3220g-eval/src/up_spi.c +++ b/configs/stm3220g-eval/src/stm32_spi.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/stm3220g_eval/src/up_spi.c - * arch/arm/src/board/up_spi.c + * configs/stm3220g_eval/src/stm32_spi.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -55,7 +54,7 @@ #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3) /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ /* Enables debug output from this file (needs CONFIG_DEBUG too) */ diff --git a/configs/stm3220g-eval/src/up_stmpe811.c b/configs/stm3220g-eval/src/stm32_stmpe811.c similarity index 99% rename from configs/stm3220g-eval/src/up_stmpe811.c rename to configs/stm3220g-eval/src/stm32_stmpe811.c index 721650a3d5c..a9e78860823 100644 --- a/configs/stm3220g-eval/src/up_stmpe811.c +++ b/configs/stm3220g-eval/src/stm32_stmpe811.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/stm3220g-eval/src/up_touchscreen.c - * arch/arm/src/board/up_touchscreen.c + * configs/stm3220g-eval/src/stm32_stmpe811.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -55,7 +54,7 @@ #include "stm3220g-internal.h" /**************************************************************************** - * Pre-Processor Definitions + * Pre-processor Definitions ****************************************************************************/ /* Configuration ************************************************************/ diff --git a/configs/stm3220g-eval/src/up_usb.c b/configs/stm3220g-eval/src/stm32_usb.c similarity index 99% rename from configs/stm3220g-eval/src/up_usb.c rename to configs/stm3220g-eval/src/stm32_usb.c index a9c1688b537..3963df0e1bc 100644 --- a/configs/stm3220g-eval/src/up_usb.c +++ b/configs/stm3220g-eval/src/stm32_usb.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/stm3220g-eval/src/up_usb.c - * arch/arm/src/board/up_usb.c + * configs/stm3220g-eval/src/stm32_usb.c * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -59,7 +58,7 @@ #ifdef CONFIG_STM32_OTGFS /************************************************************************************ - * Definitions + * Pre-processor Definitions ************************************************************************************/ #if defined(CONFIG_USBDEV) || defined(CONFIG_USBHOST) diff --git a/configs/stm3220g-eval/src/up_userleds.c b/configs/stm3220g-eval/src/stm32_userleds.c similarity index 98% rename from configs/stm3220g-eval/src/up_userleds.c rename to configs/stm3220g-eval/src/stm32_userleds.c index 0e94b501b8d..c3ce99589f3 100644 --- a/configs/stm3220g-eval/src/up_userleds.c +++ b/configs/stm3220g-eval/src/stm32_userleds.c @@ -1,6 +1,5 @@ /**************************************************************************** - * configs/stm3220g_eval/src/up_leds.c - * arch/arm/src/board/up_leds.c + * configs/stm3220g_eval/src/stm32_leds.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/stm3220g-eval/src/up_watchdog.c b/configs/stm3220g-eval/src/stm32_watchdog.c similarity index 98% rename from configs/stm3220g-eval/src/up_watchdog.c rename to configs/stm3220g-eval/src/stm32_watchdog.c index d8b635982e9..215092a046f 100644 --- a/configs/stm3220g-eval/src/up_watchdog.c +++ b/configs/stm3220g-eval/src/stm32_watchdog.c @@ -1,6 +1,5 @@ /************************************************************************************ - * configs/stm3220g-eval/src/up_watchdog.c - * arch/arm/src/board/up_watchdog.c + * configs/stm3220g-eval/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 */