diff options
author | px4dev <px4@purgatory.org> | 2013-01-11 00:45:25 -0800 |
---|---|---|
committer | px4dev <px4@purgatory.org> | 2013-01-11 00:45:25 -0800 |
commit | ca305933a15c135b2ac82d71fec9fab5b7845b7e (patch) | |
tree | ab4cfe6beabb859b40e026fc9dea1d0a7e2caf1c /nuttx/arch | |
parent | ccf9882dc5dbe38b621110f82c4e2ff63aef900e (diff) | |
parent | eaf1d8063cc707b1041e8583663d9edd45f42c5d (diff) | |
download | px4-firmware-ca305933a15c135b2ac82d71fec9fab5b7845b7e.tar.gz px4-firmware-ca305933a15c135b2ac82d71fec9fab5b7845b7e.tar.bz2 px4-firmware-ca305933a15c135b2ac82d71fec9fab5b7845b7e.zip |
Merge commit 'eaf1d8063cc707b1041e8583663d9edd45f42c5d' into nuttx-merge-5447
Build system updates to sync with NuttX upstream.
Diffstat (limited to 'nuttx/arch')
-rw-r--r-- | nuttx/arch/arm/src/stm32/Make.defs | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/nuttx/arch/arm/src/stm32/Make.defs b/nuttx/arch/arm/src/stm32/Make.defs index 54067a168..baa751c7d 100644 --- a/nuttx/arch/arm/src/stm32/Make.defs +++ b/nuttx/arch/arm/src/stm32/Make.defs @@ -41,36 +41,40 @@ endif CMN_ASRCS = up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.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_stackcheck.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_stackcheck.c ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y) CMN_ASRCS += up_exception.S CMN_CSRCS += up_vectors.c endif +ifeq ($(CONFIG_ARCH_MEMCPY),y) +CMN_ASRCS += up_memcpy.S +endif + ifeq ($(CONFIG_DEBUG_STACK),y) CMN_CSRCS += up_checkstack.c endif -ifeq ($(CONFIG_ARCH_FPU),y) -CMN_ASRCS += up_fpu.S +ifeq ($(CONFIG_ELF),y) +CMN_CSRCS += up_elf.c endif -ifeq ($(CONFIG_ARCH_MEMCPY),y) -CMN_ASRCS += memcpy.S +ifeq ($(CONFIG_ARCH_FPU),y) +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 + 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 ifeq ($(CONFIG_USBDEV),y) ifeq ($(CONFIG_STM32_USB),y) |