summaryrefslogtreecommitdiff
path: root/firmware/src/start
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/src/start')
-rw-r--r--firmware/src/start/Cstartup.S3
-rw-r--r--firmware/src/start/Cstartup_app.S2
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
personal git repositories of Harald Welte. Your mileage may vary