diff options
| author | Harald Welte <laforge@gnumonks.org> | 2011-07-30 19:04:55 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2011-07-30 19:04:55 +0200 |
| commit | a3de0a4ac29118c3ada946a0c8f7f602c9066ec1 (patch) | |
| tree | 8408d463a3ea6910d7336e24d60611da8a50b77d /firmware/src/start | |
| parent | dd88fde8d2b78243c01871cabca37c9e46ebd03d (diff) | |
| parent | ffbce3ea2cda51214be0bb7a107954f890f99b0d (diff) | |
Merge branch 'simtrace'
Diffstat (limited to 'firmware/src/start')
| -rw-r--r-- | firmware/src/start/Cstartup.S | 3 | ||||
| -rw-r--r-- | firmware/src/start/Cstartup_app.S | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/firmware/src/start/Cstartup.S b/firmware/src/start/Cstartup.S index a28b400..e262b8f 100644 --- a/firmware/src/start/Cstartup.S +++ b/firmware/src/start/Cstartup.S @@ -98,6 +98,9 @@ /* Olimex SAM7-Pxxx boards have a button B1 on PA19 that is low-active */ .equ PIO_BOOTLDR, (1 << 19) #define CONFIG_DFU_SWITCH_INV +#elif defined(SIMTRACE) + .equ PIO_BOOTLDR, (1 << 31) +#define CONFIG_DFU_SWITCH_INV #else #error please define PIO_BOOTLDR for your board #endif diff --git a/firmware/src/start/Cstartup_app.S b/firmware/src/start/Cstartup_app.S index 448cc93..197be66 100644 --- a/firmware/src/start/Cstartup_app.S +++ b/firmware/src/start/Cstartup_app.S @@ -79,6 +79,7 @@ .global _startup .func _startup _startup: +#ifndef RUN_FROM_RAM /* Relocate .data section (copy from Flash to RAM) */ ldr r1, =_etext ldr r2, =_data @@ -87,6 +88,7 @@ loop_r: cmp r2, r3 ldrlo r0, [r1], #4 strlo r0, [r2], #4 blo loop_r +#endif /* Clear .bss section (Zero init) */ mov r0, #0 |