diff options
| author | Harald Welte <laforge@gnumonks.org> | 2011-07-30 00:37:04 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2011-07-30 00:37:04 +0200 |
| commit | 5a8cd9feca7d0d09aee736ff804be4967828aefd (patch) | |
| tree | d08411df9aaae1f897a54f4bdd1c1067a4165e61 /firmware/src | |
| parent | dda0896d875ec2d33b6de94df818a2f94526272b (diff) | |
add new RUN_FROM_RAM run-mode for direct DFU-to-RAM support
Diffstat (limited to 'firmware/src')
| -rw-r--r-- | firmware/src/os/req_ctx.c | 2 | ||||
| -rw-r--r-- | firmware/src/start/Cstartup_app.S | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/firmware/src/os/req_ctx.c b/firmware/src/os/req_ctx.c index 0e4816e..cc8d57b 100644 --- a/firmware/src/os/req_ctx.c +++ b/firmware/src/os/req_ctx.c @@ -28,7 +28,7 @@ /* FIXME: locking, FIFO order processing */ -#ifdef __AT91SAM7S64__ +#if defined(__AT91SAM7S64__) || defined(RUN_FROM_RAM) #define NUM_RCTX_SMALL 16 #define NUM_RCTX_LARGE 1 #else 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 |