diff options
Diffstat (limited to 'bootloader')
-rw-r--r-- | bootloader/mrobe500.c | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/bootloader/mrobe500.c b/bootloader/mrobe500.c index f92ff4bf84..e503baa01d 100644 --- a/bootloader/mrobe500.c +++ b/bootloader/mrobe500.c | |||
@@ -46,7 +46,7 @@ | |||
46 | #include "time.h" | 46 | #include "time.h" |
47 | #include "system-arm.h" | 47 | #include "system-arm.h" |
48 | 48 | ||
49 | #define MRDEBUG | 49 | //#define MRDEBUG |
50 | 50 | ||
51 | #if defined(MRDEBUG) | 51 | #if defined(MRDEBUG) |
52 | 52 | ||
@@ -194,19 +194,28 @@ void main(void) | |||
194 | int rc; | 194 | int rc; |
195 | int(*kernel_entry)(void); | 195 | int(*kernel_entry)(void); |
196 | 196 | ||
197 | power_init(); | 197 | /* Make sure interrupts are disabled */ |
198 | lcd_init(); | 198 | set_irq_level(IRQ_DISABLED); |
199 | set_fiq_status(FIQ_DISABLED); | ||
199 | system_init(); | 200 | system_init(); |
200 | kernel_init(); | 201 | kernel_init(); |
201 | 202 | ||
202 | enable_irq(); | 203 | /* Now enable interrupts */ |
203 | enable_fiq(); | 204 | set_irq_level(IRQ_ENABLED); |
205 | set_fiq_status(FIQ_ENABLED); | ||
204 | 206 | ||
205 | adc_init(); | ||
206 | button_init(); | ||
207 | backlight_init(); | 207 | backlight_init(); |
208 | 208 | lcd_init(); | |
209 | font_init(); | 209 | font_init(); |
210 | button_init(); | ||
211 | usb_init(); | ||
212 | |||
213 | |||
214 | power_init(); | ||
215 | // enable_irq(); | ||
216 | // enable_fiq(); | ||
217 | |||
218 | adc_init(); | ||
210 | 219 | ||
211 | lcd_setfont(FONT_SYSFIXED); | 220 | lcd_setfont(FONT_SYSFIXED); |
212 | 221 | ||
@@ -217,8 +226,6 @@ void main(void) | |||
217 | printf("Rockbox boot loader"); | 226 | printf("Rockbox boot loader"); |
218 | printf("Version %s", APPSVERSION); | 227 | printf("Version %s", APPSVERSION); |
219 | 228 | ||
220 | usb_init(); | ||
221 | |||
222 | /* Enter USB mode without USB thread */ | 229 | /* Enter USB mode without USB thread */ |
223 | if(usb_detect() == USB_INSERTED) | 230 | if(usb_detect() == USB_INSERTED) |
224 | { | 231 | { |
@@ -244,9 +251,13 @@ void main(void) | |||
244 | reset_screen(); | 251 | reset_screen(); |
245 | lcd_update(); | 252 | lcd_update(); |
246 | } | 253 | } |
254 | |||
247 | #if defined(MRDEBUG) | 255 | #if defined(MRDEBUG) |
248 | mrdebug(); | 256 | mrdebug(); |
249 | #endif | 257 | #endif |
258 | |||
259 | sleep(50); | ||
260 | |||
250 | printf("ATA"); | 261 | printf("ATA"); |
251 | rc = storage_init(); | 262 | rc = storage_init(); |
252 | if(rc) | 263 | if(rc) |