diff options
| author | Michael Sparmann <theseven@rockbox.org> | 2009-10-05 12:29:08 +0000 |
|---|---|---|
| committer | Michael Sparmann <theseven@rockbox.org> | 2009-10-05 12:29:08 +0000 |
| commit | 385e821d04b4e0fbd87a163123759995f6e8e9f1 (patch) | |
| tree | 45814aba4fe89a8c74cc211a81c0fa1928d23f4f | |
| parent | e05ca6c7c517ae4b53c01c615428f7be72c1becb (diff) | |
| download | rockbox-385e821d04b4e0fbd87a163123759995f6e8e9f1.zip rockbox-385e821d04b4e0fbd87a163123759995f6e8e9f1.tar.gz rockbox-385e821d04b4e0fbd87a163123759995f6e8e9f1.tar.bz2 rockbox-385e821d04b4e0fbd87a163123759995f6e8e9f1.tar.xz | |
Fix a #ifdef typo and the reds hidden by it
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22952 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/target/arm/s5l8700/system-s5l8700.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/firmware/target/arm/s5l8700/system-s5l8700.c b/firmware/target/arm/s5l8700/system-s5l8700.c index 070d3b9..3477bb8 100644 --- a/firmware/target/arm/s5l8700/system-s5l8700.c +++ b/firmware/target/arm/s5l8700/system-s5l8700.c @@ -154,20 +154,19 @@ void system_init(void) void system_reboot(void) { -#ifdef IPODNANO2G +#ifdef IPOD_NANO2G if (ftl_sync() != 0) panicf("Failed to unmount flash!"); /* Reset the SoC */ - asm volatile(" \ - msr CPSR_c, #0xd3 \ - mov r5, #0x110000 \ - add r5, r5, #0xff \ - add r6, r5, #0xa00 \ - mov r10, #0x3c800000 \ - str r6, [r10] \ - mov r6, #0xff0 \ - str r6, [r10,#4] \ - str r5, [r10]") + asm volatile("msr CPSR_c, #0xd3 \n" + "mov r5, #0x110000 \n" + "add r5, r5, #0xff \n" + "add r6, r5, #0xa00 \n" + "mov r10, #0x3c800000 \n" + "str r6, [r10] \n" + "mov r6, #0xff0 \n" + "str r6, [r10,#4] \n" + "str r5, [r10] \n"); /* Wait for reboot to kick in */ while(1); |