LPC17xx now supports FPU needed by LPC1788; LPC17xx can not use Mike's common vectors

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5623 42af7a65-404d-4744-a932-0658087f49c3

2 files changed, 47 insertions, 46 deletions

diff --git a/nuttx/arch/arm/src/stm32/Make.defs b/nuttx/arch/arm/src/stm32/Make.defs
index fd19e3bf6..aea8719b1 100644
--- a/nuttx/arch/arm/src/stm32/Make.defs
+++ b/nuttx/arch/arm/src/stm32/Make.defs
@@ -34,33 +34,34 @@
 ############################################################################
 
 ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y)
-HEAD_ASRC	= 
+HEAD_ASRC = 
 else
-HEAD_ASRC	= stm32_vectors.S
+HEAD_ASRC = stm32_vectors.S
 endif
 
-CMN_ASRCS	= up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S \
-			  vfork.S
-CMN_CSRCS	= up_assert.c up_blocktask.c up_copystate.c \
-			  up_createstack.c up_mdelay.c up_udelay.c up_exit.c \
-			  up_initialize.c up_initialstate.c up_interruptcontext.c \
-			  up_memfault.c up_modifyreg8.c up_modifyreg16.c up_modifyreg32.c \
-			  up_releasepending.c up_releasestack.c up_reprioritizertr.c \
-			  up_schedulesigaction.c up_sigdeliver.c up_systemreset.c \
-			  up_unblocktask.c up_usestack.c up_doirq.c up_hardfault.c \
-			  up_svcall.c up_vfork.c
+CMN_ASRCS  = up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
+CMN_ASRCS += vfork.S
+
+CMN_CSRCS  = up_assert.c up_blocktask.c up_copystate.c
+CMN_CSRCS += up_createstack.c up_mdelay.c up_udelay.c up_exit.c
+CMN_CSRCS += up_initialize.c up_initialstate.c up_interruptcontext.c
+CMN_CSRCS += up_memfault.c up_modifyreg8.c up_modifyreg16.c up_modifyreg32.c
+CMN_CSRCS += up_releasepending.c up_releasestack.c up_reprioritizertr.c
+CMN_CSRCS += up_schedulesigaction.c up_sigdeliver.c up_systemreset.c
+CMN_CSRCS += up_unblocktask.c up_usestack.c up_doirq.c up_hardfault.c
+CMN_CSRCS += up_svcall.c up_vfork.c
 
 ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y)
-CMN_ASRCS	+= up_exception.S
-CMN_CSRCS	+= up_vectors.c
+CMN_ASRCS += up_exception.S
+CMN_CSRCS += up_vectors.c
 endif
 
 ifeq ($(CONFIG_ARCH_MEMCPY),y)
-CMN_ASRCS	+= up_memcpy.S
+CMN_ASRCS += up_memcpy.S
 endif
 
 ifeq ($(CONFIG_DEBUG_STACK),y)
-CMN_CSRCS	+= up_checkstack.c
+CMN_CSRCS += up_checkstack.c
 endif
 
 ifeq ($(CONFIG_ELF),y)
@@ -68,91 +69,92 @@ CMN_CSRCS += up_elf.c
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)
-CMN_ASRCS	+= up_fpu.S
+CMN_ASRCS += up_fpu.S
 endif
 
-CHIP_ASRCS	= 
-CHIP_CSRCS	= stm32_allocateheap.c stm32_start.c stm32_rcc.c stm32_lse.c \
-			  stm32_lsi.c stm32_gpio.c stm32_exti_gpio.c stm32_flash.c stm32_irq.c \
-			  stm32_timerisr.c stm32_dma.c stm32_lowputc.c stm32_serial.c \
-			  stm32_spi.c stm32_sdio.c stm32_tim.c stm32_i2c.c stm32_waste.c
+CHIP_ASRCS  = 
+
+CHIP_CSRCS  = stm32_allocateheap.c stm32_start.c stm32_rcc.c stm32_lse.c
+CHIP_CSRCS += stm32_lsi.c stm32_gpio.c stm32_exti_gpio.c stm32_flash.c stm32_irq.c
+CHIP_CSRCS += stm32_timerisr.c stm32_dma.c stm32_lowputc.c stm32_serial.c
+CHIP_CSRCS += stm32_spi.c stm32_sdio.c stm32_tim.c stm32_i2c.c stm32_waste.c
+
+ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y)
+CHIP_ASRCS += stm32_vectors.S
+endif
 
 ifeq ($(CONFIG_USBDEV),y)
 ifeq ($(CONFIG_STM32_USB),y)
-CMN_CSRCS	+= stm32_usbdev.c
+CHIP_CSRCS += stm32_usbdev.c
 endif
 ifeq ($(CONFIG_STM32_OTGFS),y)
-CMN_CSRCS	+= stm32_otgfsdev.c
+CHIP_CSRCS += stm32_otgfsdev.c
 endif
 endif
 
 ifeq ($(CONFIG_USBHOST),y)
 ifeq ($(CONFIG_STM32_OTGFS),y)
-CMN_CSRCS	+= stm32_otgfshost.c
-endif
+CHIP_CSRCS += stm32_otgfshost.c
 endif
-
-ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y)
-CHIP_ASRCS	+= stm32_vectors.S
 endif
 
 ifneq ($(CONFIG_IDLE_CUSTOM),y)
-CHIP_CSRCS	+= stm32_idle.c
+CHIP_CSRCS += stm32_idle.c
 endif
 
-CHIP_CSRCS	+= stm32_pmstop.c stm32_pmstandby.c stm32_pmsleep.c
+CHIP_CSRCS += stm32_pmstop.c stm32_pmstandby.c stm32_pmsleep.c
 
 ifneq ($(CONFIG_PM_CUSTOMINIT),y)
-CHIP_CSRCS	+= stm32_pminitialize.c
+CHIP_CSRCS += stm32_pminitialize.c
 endif
 
 ifeq ($(CONFIG_STM32_ETHMAC),y)
-CHIP_CSRCS	+= stm32_eth.c
+CHIP_CSRCS += stm32_eth.c
 endif
 
 ifeq ($(CONFIG_STM32_PWR),y)
-CHIP_CSRCS	+= stm32_pwr.c
+CHIP_CSRCS += stm32_pwr.c
 endif
 
 ifeq ($(CONFIG_RTC),y)
-CHIP_CSRCS	+= stm32_rtc.c
+CHIP_CSRCS += stm32_rtc.c
 ifeq ($(CONFIG_RTC_ALARM),y)
-CHIP_CSRCS	+= stm32_exti_alarm.c
+CHIP_CSRCS += stm32_exti_alarm.c
 endif
 endif
 
 ifeq ($(CONFIG_ADC),y)
-CHIP_CSRCS	+= stm32_adc.c
+CHIP_CSRCS += stm32_adc.c
 endif
 
 ifeq ($(CONFIG_DAC),y)
-CHIP_CSRCS	+= stm32_dac.c
+CHIP_CSRCS += stm32_dac.c
 endif
 
 ifeq ($(CONFIG_DEV_RANDOM),y)
-CHIP_CSRCS	+= stm32_rng.c
+CHIP_CSRCS += stm32_rng.c
 endif
 
 ifeq ($(CONFIG_PWM),y)
-CHIP_CSRCS	+= stm32_pwm.c
+CHIP_CSRCS += stm32_pwm.c
 endif
 
 ifeq ($(CONFIG_QENCODER),y)
-CHIP_CSRCS	+= stm32_qencoder.c
+CHIP_CSRCS += stm32_qencoder.c
 endif
 
 ifeq ($(CONFIG_CAN),y)
-CHIP_CSRCS	+= stm32_can.c
+CHIP_CSRCS += stm32_can.c
 endif
 
 ifeq ($(CONFIG_STM32_IWDG),y)
-CHIP_CSRCS	+= stm32_iwdg.c
+CHIP_CSRCS += stm32_iwdg.c
 endif
 
 ifeq ($(CONFIG_STM32_WWDG),y)
-CHIP_CSRCS	+= stm32_wwdg.c
+CHIP_CSRCS += stm32_wwdg.c
 endif
 
 ifeq ($(CONFIG_DEBUG),y)
-CHIP_CSRCS	+= stm32_dumpgpio.c
+CHIP_CSRCS += stm32_dumpgpio.c
 endif
diff --git a/nuttx/arch/arm/src/stm32/stm32_vectors.S b/nuttx/arch/arm/src/stm32/stm32_vectors.S
index 68a3e498b..ab29c2e14 100644
--- a/nuttx/arch/arm/src/stm32/stm32_vectors.S
+++ b/nuttx/arch/arm/src/stm32/stm32_vectors.S
@@ -40,7 +40,6 @@
 
 #include <nuttx/config.h>
 
-
 #include <arch/irq.h>
 
 #include "chip.h"