imx233/fuze+: don't reboot after usb more, enter usb more after storage init, remove useless printf

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

2 files changed, 3 insertions, 10 deletions

diff --git a/bootloader/imx233.c b/bootloader/imx233.c
index b160c79..b0ca0c3 100644
--- a/bootloader/imx233.c
+++ b/bootloader/imx233.c
@@ -92,9 +92,6 @@ static void usb_mode(int connect_timeout)
 
     /* Put drivers initialized for USB connection into a known state */
     usb_close();
-
-    system_exception_wait();
-    power_off();
 }
 #else /* !HAVE_BOOTLOADER_USB_MODE */
 static void usb_mode(int connect_timeout)
@@ -141,17 +138,14 @@ void main(uint32_t arg)
     if(ret < 0)
         error(EATA, ret, true);
 
-    if(usb_plugged())
-        usb_mode(HZ * 2);
-
     while(!disk_init(IF_MV(0)))
         printf("disk_init failed!");
 
     if((ret = disk_mount_all()) <= 0)
         error(EDISK, ret, false);
 
-    if(button_read_device() & BUTTON_VOL_UP)
-        printf("Booting from SD card required.");
+    if(usb_plugged())
+        usb_mode(HZ);
 
     printf("Loading firmware");
 
@@ -164,7 +158,7 @@ void main(uint32_t arg)
     }
 
     kernel_entry = (void*) loadbuffer;
-    //cpucache_invalidate();
+    cpucache_invalidate();
     printf("Executing");
     kernel_entry();
     printf("ERR: Failed to boot");
diff --git a/firmware/target/arm/imx233/usb-imx233.c b/firmware/target/arm/imx233/usb-imx233.c
index 8e05da0..c2d355a 100644
--- a/firmware/target/arm/imx233/usb-imx233.c
+++ b/firmware/target/arm/imx233/usb-imx233.c
@@ -42,7 +42,6 @@ void usb_remove_int(void)
 
 void usb_drv_usb_detect_event()
 {
-    printf("usb_drv_usb_detect_event");
     usb_status_event(USB_INSERTED);
 }