aboutsummaryrefslogtreecommitdiff
path: root/lib/stm32/f4/vector.c
diff options
context:
space:
mode:
authorchrysn2012-09-13 22:32:28 +0200
committerchrysn2012-09-13 22:32:28 +0200
commit0508f30d2dcd74008e76005c735dc47b7cea5132 (patch)
tree01930442983ac158eca9746f6756ea440e9db15c /lib/stm32/f4/vector.c
parent282891f8a61d6be822da978e44f0ed3e807c0cd6 (diff)
parentdcd98dde86c68340e950d12b078d24fd30bef625 (diff)
Merge branch 'master' into efm32
Conflicts: Doxyfile Makefile
Diffstat (limited to 'lib/stm32/f4/vector.c')
-rw-r--r--lib/stm32/f4/vector.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stm32/f4/vector.c b/lib/stm32/f4/vector.c
index 1c901da..3429bfb 100644
--- a/lib/stm32/f4/vector.c
+++ b/lib/stm32/f4/vector.c
@@ -21,7 +21,7 @@
#define WEAK __attribute__ ((weak))
/* Symbols exported by the linker script(s): */
-extern unsigned _etext, _data, _edata, _ebss, _stack;
+extern unsigned _data_loadaddr, _data, _edata, _ebss, _stack;
void main(void);
void reset_handler(void);
@@ -224,7 +224,7 @@ void reset_handler(void)
__asm__("MSR msp, %0" : : "r"(&_stack));
- for (src = &_etext, dest = &_data; dest < &_edata; src++, dest++)
+ for (src = &_data_loadaddr, dest = &_data; dest < &_edata; src++, dest++)
*dest = *src;
while (dest < &_ebss)