diff options
-rw-r--r-- | firmware/target/arm/s5l8700/ata-nand-s5l8700.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/s5l8700/system-s5l8700.c | 15 |
2 files changed, 16 insertions, 3 deletions
diff --git a/firmware/target/arm/s5l8700/ata-nand-s5l8700.c b/firmware/target/arm/s5l8700/ata-nand-s5l8700.c index d00580279b..ce1fa4df5f 100644 --- a/firmware/target/arm/s5l8700/ata-nand-s5l8700.c +++ b/firmware/target/arm/s5l8700/ata-nand-s5l8700.c | |||
@@ -102,7 +102,9 @@ long nand_last_disk_activity(void) | |||
102 | int nand_flush(void) | 102 | int nand_flush(void) |
103 | { | 103 | { |
104 | last_disk_activity = current_tick; | 104 | last_disk_activity = current_tick; |
105 | return ftl_sync(); | 105 | int rc = ftl_sync(); |
106 | if (rc != 0) panicf("Failed to unmount flash: %X", rc); | ||
107 | return rc; | ||
106 | } | 108 | } |
107 | #endif | 109 | #endif |
108 | 110 | ||
diff --git a/firmware/target/arm/s5l8700/system-s5l8700.c b/firmware/target/arm/s5l8700/system-s5l8700.c index 394a47369e..63bd47e1a4 100644 --- a/firmware/target/arm/s5l8700/system-s5l8700.c +++ b/firmware/target/arm/s5l8700/system-s5l8700.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include "system.h" | 23 | #include "system.h" |
24 | #include "panic.h" | 24 | #include "panic.h" |
25 | #ifdef IPOD_NANO2G | 25 | #ifdef IPOD_NANO2G |
26 | #include "ftl-target.h" | 26 | #include "storage.h" |
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | #define default_interrupt(name) \ | 29 | #define default_interrupt(name) \ |
@@ -150,6 +150,15 @@ void fiq_handler(void) | |||
150 | } | 150 | } |
151 | 151 | ||
152 | 152 | ||
153 | static void gpio_init(void) | ||
154 | { | ||
155 | } | ||
156 | |||
157 | static void clock_init(void) | ||
158 | { | ||
159 | } | ||
160 | |||
161 | |||
153 | void system_init(void) | 162 | void system_init(void) |
154 | { | 163 | { |
155 | } | 164 | } |
@@ -157,7 +166,9 @@ void system_init(void) | |||
157 | void system_reboot(void) | 166 | void system_reboot(void) |
158 | { | 167 | { |
159 | #ifdef IPOD_NANO2G | 168 | #ifdef IPOD_NANO2G |
160 | if (ftl_sync() != 0) panicf("Failed to unmount flash!"); | 169 | #ifdef HAVE_STORAGE_FLUSH |
170 | storage_flush(); | ||
171 | #endif | ||
161 | 172 | ||
162 | /* Reset the SoC */ | 173 | /* Reset the SoC */ |
163 | asm volatile("msr CPSR_c, #0xd3 \n" | 174 | asm volatile("msr CPSR_c, #0xd3 \n" |