diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-06-01 20:50:50 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-06-01 20:50:50 +0000 |
| commit | a5026dbc2f0b5610d1cac2ed486c26c1967cd1a8 (patch) | |
| tree | ec0ce6ce04c39aac8767fa405ec6cf1602f79385 /nuttx/arch | |
| parent | 0ce44a249b9b6ac90489a13b8b64dd1017a53911 (diff) | |
| download | px4-nuttx-a5026dbc2f0b5610d1cac2ed486c26c1967cd1a8.tar.gz px4-nuttx-a5026dbc2f0b5610d1cac2ed486c26c1967cd1a8.tar.bz2 px4-nuttx-a5026dbc2f0b5610d1cac2ed486c26c1967cd1a8.zip | |
Remove RUNFROMFLASH option from str-p711
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1845 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch')
| -rw-r--r-- | nuttx/arch/arm/src/str71x/str71x_head.S | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/nuttx/arch/arm/src/str71x/str71x_head.S b/nuttx/arch/arm/src/str71x/str71x_head.S index 2e5eaef5c..fd7f263e7 100644 --- a/nuttx/arch/arm/src/str71x/str71x_head.S +++ b/nuttx/arch/arm/src/str71x/str71x_head.S @@ -509,19 +509,16 @@ __flashstart: strcc r0, [r4], #4 bcc 1b - /* Copy system .data sections to new home in RAM. */ - -#ifdef CONFIG_BOOT_RUNFROMFLASH + /* Copy system .data sections from FLASH to new home in RAM. */ adr r3, LC2 ldmia r3, {r0, r1, r2} -1: ldmia r0!, {r3 - r10} +2: ldmia r0!, {r3 - r10} stmia r1!, {r3 - r10} cmp r1, r2 - blt 1b + blt 2b -#endif /* Initialize clocking */ bl str71x_prccuinit @@ -602,11 +599,9 @@ LC0: .long _sbss .long _ebss .long _ebss+CONFIG_IDLETHREAD_STACKSIZE-4 -#ifdef CONFIG_BOOT_RUNFROMFLASH LC2: .long _eronly /* Where .data defaults are stored in FLASH */ .long _sdata /* Where .data needs to reside in SDRAM */ .long _edata -#endif .size __start, .-__start /* This global variable is unsigned long g_heapbase and is |