diff options
author | Dave Chapman <dave@dchapman.com> | 2006-02-21 21:13:03 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2006-02-21 21:13:03 +0000 |
commit | 8adc81dffbb72d98e469043e3c4ce8430f19799b (patch) | |
tree | 0af8ac3aef84466a2fade7b8d3604d5cf9f3d671 /bootloader | |
parent | d3bb5a11c400597640a326cf2c4eff7f74925a96 (diff) | |
download | rockbox-8adc81dffbb72d98e469043e3c4ce8430f19799b.tar.gz rockbox-8adc81dffbb72d98e469043e3c4ce8430f19799b.zip |
iPod 3G: Use correct DRAM_START address when branching to Rockbox
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8767 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader')
-rw-r--r-- | bootloader/ipod.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bootloader/ipod.c b/bootloader/ipod.c index 2728529dce..f62fa265a5 100644 --- a/bootloader/ipod.c +++ b/bootloader/ipod.c | |||
@@ -39,6 +39,9 @@ | |||
39 | #include "power.h" | 39 | #include "power.h" |
40 | #include "file.h" | 40 | #include "file.h" |
41 | 41 | ||
42 | #define XSC(X) #X | ||
43 | #define SC(X) XSC(X) | ||
44 | |||
42 | #if (CONFIG_CPU == PP5020) | 45 | #if (CONFIG_CPU == PP5020) |
43 | #define DRAM_START 0x10000000 | 46 | #define DRAM_START 0x10000000 |
44 | #else | 47 | #else |
@@ -418,8 +421,8 @@ void* main(void) | |||
418 | /* Transfer execution directly to Rockbox - we don't want | 421 | /* Transfer execution directly to Rockbox - we don't want |
419 | to run the rest of the bootloader startup code. */ | 422 | to run the rest of the bootloader startup code. */ |
420 | asm volatile( | 423 | asm volatile( |
421 | "mov r0, #0x10000000 \n" | 424 | "mov r0, #" SC(DRAM_START) "\n" |
422 | "mov pc, r0 \n" | 425 | "mov pc, r0 \n" |
423 | ); | 426 | ); |
424 | 427 | ||
425 | /* We don't get here, but keep the compiler happy. */ | 428 | /* We don't get here, but keep the compiler happy. */ |