aboutsummaryrefslogtreecommitdiffstats
path: root/os/ports/GCC/ARMCMx
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-07-11 06:03:32 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-07-11 06:03:32 +0000
commit25588d58b51b414461007cea4b566e9bddf85961 (patch)
tree050122e9dfc2cc79702353634779f4c16044576e /os/ports/GCC/ARMCMx
parentf6554b6135a1ca9cb4b2aa05b7cbc94f828ed996 (diff)
downloadChibiOS-25588d58b51b414461007cea4b566e9bddf85961.tar.gz
ChibiOS-25588d58b51b414461007cea4b566e9bddf85961.tar.bz2
ChibiOS-25588d58b51b414461007cea4b566e9bddf85961.zip
Fixed bugs 3026528 and 3027975.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2062 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/ports/GCC/ARMCMx')
-rw-r--r--os/ports/GCC/ARMCMx/STM32F10x/vectors.s7
1 files changed, 7 insertions, 0 deletions
diff --git a/os/ports/GCC/ARMCMx/STM32F10x/vectors.s b/os/ports/GCC/ARMCMx/STM32F10x/vectors.s
index 58b0f8aea..0d516fb04 100644
--- a/os/ports/GCC/ARMCMx/STM32F10x/vectors.s
+++ b/os/ports/GCC/ARMCMx/STM32F10x/vectors.s
@@ -20,6 +20,13 @@
.syntax unified
.thumb
+/* If the macro is not defined in the Makefile then a board.h file must be
+ provided containing the definition of the STM32 family member.*/
+#if !defined(STM32F10X_LD) && !defined(STM32F10X_MD) && \
+ !defined(STM32F10X_HD) && !defined(STM32F10X_CL)
+#include "board.h"
+#endif
+
.section vectors
_vectors:
.word __ram_end__