From dfb6261f45bb4a34b3fdfc10047c908534e0bee5 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Wed, 22 Feb 2012 18:14:18 +0000
Subject: Incoporate new ARMv7-M exception handling logic contributed by Mike
 Smith

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4413 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/arch/arm/src/stm32/Make.defs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'nuttx/arch/arm/src/stm32/Make.defs')

diff --git a/nuttx/arch/arm/src/stm32/Make.defs b/nuttx/arch/arm/src/stm32/Make.defs
index 213ac0be9..351680685 100644
--- a/nuttx/arch/arm/src/stm32/Make.defs
+++ b/nuttx/arch/arm/src/stm32/Make.defs
@@ -33,7 +33,11 @@
 #
 ############################################################################
 
+ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y)
+HEAD_ASRC	= 
+else
 HEAD_ASRC	= stm32_vectors.S
+endif
 
 CMN_ASRCS	= up_saveusercontext.S up_fullcontextrestore.S up_switchcontext.S
 CMN_CSRCS	= up_assert.c up_blocktask.c up_copystate.c \
@@ -44,6 +48,11 @@ CMN_CSRCS	= up_assert.c up_blocktask.c up_copystate.c \
 		  up_schedulesigaction.c up_sigdeliver.c up_unblocktask.c \
 		  up_usestack.c up_doirq.c up_hardfault.c up_svcall.c
 
+ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y)
+CMN_ASRCS	+= up_exception.S stm32_vectors.S
+CMN_CSRCS	+= up_vectors.c
+endif
+
 ifeq ($(CONFIG_DEBUG_STACK),y)
 CMN_CSRCS	+= up_checkstack.c
 endif
@@ -59,6 +68,10 @@ CHIP_CSRCS	= stm32_allocateheap.c stm32_start.c stm32_rcc.c stm32_lse.c \
 		  stm32_spi.c stm32_usbdev.c stm32_sdio.c stm32_tim.c stm32_i2c.c \
 		  stm32_waste.c
 
+ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y)
+CHIP_ASRCS	+= stm32_vectors.S
+endif
+
 ifneq ($(CONFIG_IDLE_CUSTOM),y)
 CHIP_CSRCS	+= stm32_idle.c
 endif
-- 
cgit v1.2.3