From 25f0060d21b098ea3287c234761f703e9e55d5fe Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Mon, 5 Sep 2011 13:58:29 +0000 Subject: 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 --- bootloader/imx233.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'bootloader') 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"); -- cgit v1.1