aboutsummaryrefslogtreecommitdiff
path: root/lib/lpc43xx/vector.c
diff options
context:
space:
mode:
authorPiotr Esden-Tempski2012-09-10 13:42:10 -0700
committerPiotr Esden-Tempski2012-09-10 13:42:10 -0700
commit7373bfcb9b144ae7c2e8685d6d65bbeb3786ca7b (patch)
tree74c4a52d515a1102a15a7de272b212663d1bf20c /lib/lpc43xx/vector.c
parent03807ddd6c3cef98054a9ef771decac6b7468bc4 (diff)
parent82ef2936a673f0c6cba86e02d80104f56e1de5a2 (diff)
Merging pull request #26 "Linker script cleanup/improvements"
Merge remote-tracking branch 'schodet/linker-script'
Diffstat (limited to 'lib/lpc43xx/vector.c')
-rw-r--r--lib/lpc43xx/vector.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/lpc43xx/vector.c b/lib/lpc43xx/vector.c
index daef5a9..23008bc 100644
--- a/lib/lpc43xx/vector.c
+++ b/lib/lpc43xx/vector.c
@@ -20,8 +20,8 @@
#define WEAK __attribute__ ((weak))
-/* Symbols exported by the linker script(s). */
-extern unsigned _etext, _data, _edata, _ebss, _stack;
+/* Symbols exported by the linker script(s): */
+extern unsigned _data_loadaddr, _data, _edata, _ebss, _stack;
extern unsigned _etext_ram, _text_ram, _etext_rom;
void main(void);
@@ -165,6 +165,7 @@ void (*const vector_table[]) (void) = {
void reset_handler(void)
{
volatile unsigned *src, *dest;
+
__asm__("MSR msp, %0" : : "r"(&_stack));
/* Copy the code from ROM to Real RAM (if enabled) */
@@ -185,7 +186,7 @@ void reset_handler(void)
/* Continue Execution in RAM */
}
- for (src = &_etext, dest = &_data; dest < &_edata; src++, dest++)
+ for (src = &_data_loadaddr, dest = &_data; dest < &_edata; src++, dest++)
*dest = *src;
while (dest < &_ebss)