diff options
Diffstat (limited to 'bootloader/imx233.c')
-rw-r--r-- | bootloader/imx233.c | 42 |
1 files changed, 9 insertions, 33 deletions
diff --git a/bootloader/imx233.c b/bootloader/imx233.c index 85a545b523..523c902bb6 100644 --- a/bootloader/imx233.c +++ b/bootloader/imx233.c | |||
@@ -35,9 +35,7 @@ | |||
35 | #include "disk.h" | 35 | #include "disk.h" |
36 | #include "panic.h" | 36 | #include "panic.h" |
37 | #include "power.h" | 37 | #include "power.h" |
38 | #include "pinctrl-imx233.h" | ||
39 | #include "system-target.h" | 38 | #include "system-target.h" |
40 | #include "ssp-imx233.h" | ||
41 | 39 | ||
42 | #include "usb.h" | 40 | #include "usb.h" |
43 | 41 | ||
@@ -65,41 +63,19 @@ void main(void) | |||
65 | 63 | ||
66 | //button_debug_screen(); | 64 | //button_debug_screen(); |
67 | 65 | ||
68 | #if 0 | ||
69 | usb_init(); | ||
70 | usb_start_monitoring(); | ||
71 | extern int usb_status; | ||
72 | usb_status = USB_INSERTED; | ||
73 | usb_status_event(USB_POWERED); | ||
74 | |||
75 | printf("USB: Connecting"); | ||
76 | |||
77 | while(1) | ||
78 | { | ||
79 | int button = button_get_w_tmo(HZ/25); | ||
80 | |||
81 | if(button == SYS_USB_CONNECTED) | ||
82 | break; /* Hit */ | ||
83 | if(button_read_device() & BUTTON_POWER) | ||
84 | power_off(); | ||
85 | yield(); | ||
86 | } | ||
87 | |||
88 | printf("USB: Connected"); | ||
89 | while(1) | ||
90 | { | ||
91 | int button = button_get_w_tmo(HZ/25); | ||
92 | |||
93 | if(button_read_device() & BUTTON_POWER) | ||
94 | power_off(); | ||
95 | yield(); | ||
96 | } | ||
97 | #endif | ||
98 | |||
99 | ret = storage_init(); | 66 | ret = storage_init(); |
100 | if(ret < 0) | 67 | if(ret < 0) |
101 | error(EATA, ret, true); | 68 | error(EATA, ret, true); |
102 | 69 | ||
70 | #ifdef HAVE_BOOTLOADER_USB_MODE | ||
71 | usb_init(); | ||
72 | usb_core_enable_driver(USB_DRIVER_SERIAL, true); | ||
73 | usb_attach(); | ||
74 | while(!(button_read_device() & BUTTON_POWER)) | ||
75 | yield(); | ||
76 | power_off(); | ||
77 | #endif /* HAVE_BOOTLOADER_USB_MODE */ | ||
78 | |||
103 | while(!disk_init(IF_MV(0))) | 79 | while(!disk_init(IF_MV(0))) |
104 | panicf("disk_init failed!"); | 80 | panicf("disk_init failed!"); |
105 | 81 | ||