Bring the iPod Nano 2G shutdown FTL panics back.

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

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)
 int nand_flush(void)
 {
     last_disk_activity = current_tick;
-    return ftl_sync();
+    int rc = ftl_sync();
+    if (rc != 0) panicf("Failed to unmount flash: %X", rc);
+    return rc;
 }
 #endif
 
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 @@
 #include "system.h"
 #include "panic.h"
 #ifdef IPOD_NANO2G
-#include "ftl-target.h"
+#include "storage.h"
 #endif
 
 #define default_interrupt(name) \
@@ -150,6 +150,15 @@ void fiq_handler(void)
 }
 
 
+static void gpio_init(void)
+{
+}
+
+static void clock_init(void)
+{
+}
+
+
 void system_init(void)
 {
 }
@@ -157,7 +166,9 @@ void system_init(void)
 void system_reboot(void)
 {
 #ifdef IPOD_NANO2G
-    if (ftl_sync() != 0) panicf("Failed to unmount flash!");
+#ifdef HAVE_STORAGE_FLUSH
+    storage_flush();
+#endif
 
     /* Reset the SoC */
     asm volatile("msr CPSR_c, #0xd3    \n"