diff options
-rw-r--r-- | bootloader/imx233.c | 12 | ||||
-rw-r--r-- | firmware/target/arm/imx233/usb-imx233.c | 1 |
2 files changed, 3 insertions, 10 deletions
diff --git a/bootloader/imx233.c b/bootloader/imx233.c index b160c79702..b0ca0c3b01 100644 --- a/bootloader/imx233.c +++ b/bootloader/imx233.c | |||
@@ -92,9 +92,6 @@ static void usb_mode(int connect_timeout) | |||
92 | 92 | ||
93 | /* Put drivers initialized for USB connection into a known state */ | 93 | /* Put drivers initialized for USB connection into a known state */ |
94 | usb_close(); | 94 | usb_close(); |
95 | |||
96 | system_exception_wait(); | ||
97 | power_off(); | ||
98 | } | 95 | } |
99 | #else /* !HAVE_BOOTLOADER_USB_MODE */ | 96 | #else /* !HAVE_BOOTLOADER_USB_MODE */ |
100 | static void usb_mode(int connect_timeout) | 97 | static void usb_mode(int connect_timeout) |
@@ -141,17 +138,14 @@ void main(uint32_t arg) | |||
141 | if(ret < 0) | 138 | if(ret < 0) |
142 | error(EATA, ret, true); | 139 | error(EATA, ret, true); |
143 | 140 | ||
144 | if(usb_plugged()) | ||
145 | usb_mode(HZ * 2); | ||
146 | |||
147 | while(!disk_init(IF_MV(0))) | 141 | while(!disk_init(IF_MV(0))) |
148 | printf("disk_init failed!"); | 142 | printf("disk_init failed!"); |
149 | 143 | ||
150 | if((ret = disk_mount_all()) <= 0) | 144 | if((ret = disk_mount_all()) <= 0) |
151 | error(EDISK, ret, false); | 145 | error(EDISK, ret, false); |
152 | 146 | ||
153 | if(button_read_device() & BUTTON_VOL_UP) | 147 | if(usb_plugged()) |
154 | printf("Booting from SD card required."); | 148 | usb_mode(HZ); |
155 | 149 | ||
156 | printf("Loading firmware"); | 150 | printf("Loading firmware"); |
157 | 151 | ||
@@ -164,7 +158,7 @@ void main(uint32_t arg) | |||
164 | } | 158 | } |
165 | 159 | ||
166 | kernel_entry = (void*) loadbuffer; | 160 | kernel_entry = (void*) loadbuffer; |
167 | //cpucache_invalidate(); | 161 | cpucache_invalidate(); |
168 | printf("Executing"); | 162 | printf("Executing"); |
169 | kernel_entry(); | 163 | kernel_entry(); |
170 | printf("ERR: Failed to boot"); | 164 | printf("ERR: Failed to boot"); |
diff --git a/firmware/target/arm/imx233/usb-imx233.c b/firmware/target/arm/imx233/usb-imx233.c index 8e05da0a95..c2d355ad88 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) | |||
42 | 42 | ||
43 | void usb_drv_usb_detect_event() | 43 | void usb_drv_usb_detect_event() |
44 | { | 44 | { |
45 | printf("usb_drv_usb_detect_event"); | ||
46 | usb_status_event(USB_INSERTED); | 45 | usb_status_event(USB_INSERTED); |
47 | } | 46 | } |
48 | 47 | ||