aboutsummaryrefslogtreecommitdiffstats
path: root/os/common
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2018-05-12 07:01:42 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2018-05-12 07:01:42 +0000
commitd6b969dac4bab057ba283ba93da5edb03b8c24a2 (patch)
treee5207a66fdb1b929f560bf091f756e58634b0676 /os/common
parent2dbd8fea1aab8bdaa435ff52139153c92b29ee90 (diff)
downloadChibiOS-d6b969dac4bab057ba283ba93da5edb03b8c24a2.tar.gz
ChibiOS-d6b969dac4bab057ba283ba93da5edb03b8c24a2.tar.bz2
ChibiOS-d6b969dac4bab057ba283ba93da5edb03b8c24a2.zip
Fixed bug #947.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12023 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'os/common')
-rw-r--r--os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S2
-rw-r--r--os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.S2
2 files changed, 2 insertions, 2 deletions
diff --git a/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S b/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S
index b3bed66b3..36b96dfe7 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S
+++ b/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S
@@ -50,7 +50,7 @@
* @note This is required if the boot process is not reliable for whatever
* reason (bad ROMs, bad bootloaders, bad debuggers=.
*/
-#if !defined(CRT0_VTOR_INIT) || defined(__DOXYGEN__)
+#if !defined(CRT0_FORCE_MSP_INIT) || defined(__DOXYGEN__)
#define CRT0_FORCE_MSP_INIT TRUE
#endif
diff --git a/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.S b/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.S
index 453a9e64c..7d84a7448 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.S
+++ b/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.S
@@ -57,7 +57,7 @@
* @note This is required if the boot process is not reliable for whatever
* reason (bad ROMs, bad bootloaders, bad debuggers=.
*/
-#if !defined(CRT0_VTOR_INIT) || defined(__DOXYGEN__)
+#if !defined(CRT0_FORCE_MSP_INIT) || defined(__DOXYGEN__)
#define CRT0_FORCE_MSP_INIT TRUE
#endif