Nano2G bootloader - fix dual-booting the Apple firmware.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23139 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 2 insertions, 3 deletions

diff --git a/firmware/target/arm/s5l8700/boot.lds b/firmware/target/arm/s5l8700/boot.lds
index 637a3a29c1..308a97dca8 100644
--- a/firmware/target/arm/s5l8700/boot.lds
+++ b/firmware/target/arm/s5l8700/boot.lds
@@ -12,11 +12,10 @@ STARTUP(target/arm/s5l8700/crt0.o)
 #define DRAMORIG 0x08000000
 #define DRAMSIZE (MEMORYSIZE * 0x100000)
 
+#define IRAMORIG 0x22000000
 #if CONFIG_CPU==S5L8701
-#define IRAMORIG 0x0
 #define IRAMSIZE 176K
 #else
-#define IRAMORIG 0x22000000
 #define IRAMSIZE 256K
 #endif
 
diff --git a/firmware/target/arm/s5l8700/crt0.S b/firmware/target/arm/s5l8700/crt0.S
index 3cc376711c..98f98a3178 100644
--- a/firmware/target/arm/s5l8700/crt0.S
+++ b/firmware/target/arm/s5l8700/crt0.S
@@ -91,7 +91,7 @@ newstart2:
 #ifdef BOOTLOADER
     /* Relocate ourself to IRAM - we have been loaded to DRAM */
     mov    r0, #0x08000000   /* source (DRAM) */
-    mov    r1, #0x00000000   /* dest (IRAM) */
+    mov    r1, #0x22000000   /* dest (IRAM) */
     ldr    r2, =_dataend
 1:
     cmp    r2, r1