Permalink
Browse files

imx233/bl: usb mode has priority over hold

Change-Id: I0d124eaed0ebf1ca18c022684a96dfbf7d740c7e
  • Loading branch information...
1 parent 7a828ac commit f75310598c6daa51f0d2e5839f031bbf100ba4ba @pamaury committed Sep 26, 2013
Showing with 18 additions and 17 deletions.
  1. +18 −17 bootloader/imx233.c
View
35 bootloader/imx233.c
@@ -156,23 +156,6 @@ void main(uint32_t arg, uint32_t addr)
backlight_init();
button_init();
- /* dummy read, might be necessary to init things */
-#ifdef HAVE_BUTTON_DATA
- int data;
- button_read_device(&data);
-#else
- button_read_device();
-#endif
-
-#ifdef HAS_BUTTON_HOLD
- if(button_hold())
- {
- printf("Hold switch on");
- printf("Shutting down...");
- sleep(HZ);
- power_off();
- }
-#endif
printf("%s: %s", MSG(240, "Ver", "Boot version"), RBVERSION);
printf("%s: %x ", MSG(240, "Arg", "Boot arg"), arg);
@@ -202,6 +185,24 @@ void main(uint32_t arg, uint32_t addr)
if(usb_detect() == USB_INSERTED)
usb_mode(HZ);
+ /* dummy read, might be necessary to init things */
+#ifdef HAVE_BUTTON_DATA
+ int data;
+ button_read_device(&data);
+#else
+ button_read_device();
+#endif
+
+#ifdef HAS_BUTTON_HOLD
+ if(button_hold())
+ {
+ printf("Hold switch on");
+ printf("Shutting down...");
+ sleep(HZ);
+ power_off();
+ }
+#endif
+
printf("Loading firmware");
loadbuffer = (unsigned char*)loadaddress;

0 comments on commit f753105

Please sign in to comment.