aboutsummaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2011-07-30 00:37:04 +0200
committerHarald Welte <laforge@gnumonks.org>2011-07-30 00:37:04 +0200
commit5a8cd9feca7d0d09aee736ff804be4967828aefd (patch)
treed08411df9aaae1f897a54f4bdd1c1067a4165e61 /firmware
parentdda0896d875ec2d33b6de94df818a2f94526272b (diff)
add new RUN_FROM_RAM run-mode for direct DFU-to-RAM support
Diffstat (limited to 'firmware')
-rw-r--r--firmware/Makefile4
-rw-r--r--firmware/link/AT91SAM7S128-RAM-sam7dfu-app.ld94
-rw-r--r--firmware/src/os/req_ctx.c2
-rw-r--r--firmware/src/start/Cstartup_app.S2
4 files changed, 99 insertions, 3 deletions
diff --git a/firmware/Makefile b/firmware/Makefile
index b085c33..68ff85f 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -49,7 +49,7 @@ USE_THUMB_MODE = NO
#USE_THUMB_MODE = YES
## Create ROM-Image (final)
-RUN_MODE=RUN_FROM_ROM
+RUN_MODE:=RUN_FROM_ROM
## Create RAM-Image (debugging) - not used in this example
#RUN_MODE=RUN_FROM_RAM
@@ -319,7 +319,7 @@ LDFLAGS += -Wl,--gc-sections -Wl,--entry=_startup
# Set Linker-Script Depending On Selected Memory and Controller
ifeq ($(RUN_MODE),RUN_FROM_RAM)
-LDFLAGS +=-T$(PATH_TO_LINKSCRIPTS)$(SUBMDL)-RAM.ld
+LDFLAGS +=-T$(PATH_TO_LINKSCRIPTS)$(SUBMDL)-RAM$(IMGTYPE).ld
else
LDFLAGS +=-T$(PATH_TO_LINKSCRIPTS)$(SUBMDL)-ROM$(IMGTYPE).ld
endif
diff --git a/firmware/link/AT91SAM7S128-RAM-sam7dfu-app.ld b/firmware/link/AT91SAM7S128-RAM-sam7dfu-app.ld
new file mode 100644
index 0000000..674ee00
--- /dev/null
+++ b/firmware/link/AT91SAM7S128-RAM-sam7dfu-app.ld
@@ -0,0 +1,94 @@
+/* Memory Definitions */
+
+MEMORY
+{
+ /* reserve 16K DFU area on top of flash */
+ /* FLASH (rx) : ORIGIN = 0x00104000, LENGTH = (0x00020000 - 0x4000 - 0x400) */
+ /* reserve 1k DFU area on top of RAM */
+ DATA (rw) : ORIGIN = 0x00200400, LENGTH = (0x00008000 - 0x400)
+ STACK (rw) : ORIGIN = 0x00208000, LENGTH = 0x00000000
+}
+
+
+/* Section Definitions */
+
+SECTIONS
+{
+ . = 0x00000000;
+ /* first section is .text which is used for code */
+ .text 0x00200400: AT ( 0x00000000 ) {
+ src/start/Cstartup_app.o (.text)
+ * (.text)
+ * (.rodata*)
+ . = ALIGN(4);
+
+ _etext = . ;
+ PROVIDE (etext = .);
+
+ _data = . ;
+ * (.fastrun)
+ * (.data)
+ . = ALIGN(4);
+ } >DATA
+
+ _edata = . ;
+ PROVIDE (edata = .);
+
+ /* .bss section which is used for uninitialized data */
+ .bss : {
+ __bss_start = . ;
+ __bss_start__ = . ;
+ *(.bss)
+ *(COMMON)
+ } >DATA
+
+ . = ALIGN(4);
+ __bss_end__ = . ;
+ __bss_end__ = . ;
+
+ PROVIDE (main = .);
+
+ _end = . ;
+
+ . = ALIGN(4);
+ .int_data : {
+ *(.internal_ram_top)
+ } >STACK
+
+ PROVIDE (end = .);
+
+ /* Stabs debugging sections. */
+ .stab 0 : { *(.stab) }
+ .stabstr 0 : { *(.stabstr) }
+ .stab.excl 0 : { *(.stab.excl) }
+ .stab.exclstr 0 : { *(.stab.exclstr) }
+ .stab.index 0 : { *(.stab.index) }
+ .stab.indexstr 0 : { *(.stab.indexstr) }
+ .comment 0 : { *(.comment) }
+ /* DWARF debug sections.
+ Symbols in the DWARF debugging sections are relative to the beginning
+ of the section so we begin them at 0. */
+ /* DWARF 1 */
+ .debug 0 : { *(.debug) }
+ .line 0 : { *(.line) }
+ /* GNU DWARF 1 extensions */
+ .debug_srcinfo 0 : { *(.debug_srcinfo) }
+ .debug_sfnames 0 : { *(.debug_sfnames) }
+ /* DWARF 1.1 and DWARF 2 */
+ .debug_aranges 0 : { *(.debug_aranges) }
+ .debug_pubnames 0 : { *(.debug_pubnames) }
+ /* DWARF 2 */
+ .debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) }
+ .debug_abbrev 0 : { *(.debug_abbrev) }
+ .debug_line 0 : { *(.debug_line) }
+ .debug_frame 0 : { *(.debug_frame) }
+ .debug_str 0 : { *(.debug_str) }
+ .debug_loc 0 : { *(.debug_loc) }
+ .debug_macinfo 0 : { *(.debug_macinfo) }
+ /* SGI/MIPS DWARF 2 extensions */
+ .debug_weaknames 0 : { *(.debug_weaknames) }
+ .debug_funcnames 0 : { *(.debug_funcnames) }
+ .debug_typenames 0 : { *(.debug_typenames) }
+ .debug_varnames 0 : { *(.debug_varnames) }
+
+}
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