diff options
Diffstat (limited to 'bootloader')
-rw-r--r-- | bootloader/gigabeat.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/bootloader/gigabeat.c b/bootloader/gigabeat.c index 62c31310ae..38e8bbf63e 100644 --- a/bootloader/gigabeat.c +++ b/bootloader/gigabeat.c | |||
@@ -70,8 +70,8 @@ void memdump(void) | |||
70 | 70 | ||
71 | data = *(volatile int *)memlocations[i].address; | 71 | data = *(volatile int *)memlocations[i].address; |
72 | 72 | ||
73 | snprintf(tmp, sizeof(tmp), "%s %s 0x%08X", | 73 | snprintf(tmp, sizeof(tmp), "%s %s 0x%08X", |
74 | (i==current) ? "*" : " ", | 74 | (i==current) ? "*" : " ", |
75 | memlocations[i].desc, | 75 | memlocations[i].desc, |
76 | data); | 76 | data); |
77 | lcd_puts(0, i*2+5, tmp); | 77 | lcd_puts(0, i*2+5, tmp); |
@@ -323,6 +323,9 @@ void * main(void) | |||
323 | lcd_puts(0, line++, "Hold MENU when booting for rescue mode."); | 323 | lcd_puts(0, line++, "Hold MENU when booting for rescue mode."); |
324 | lcd_puts(0, line++, " \"VOL+\" button to restore original kernel"); | 324 | lcd_puts(0, line++, " \"VOL+\" button to restore original kernel"); |
325 | lcd_puts(0, line++, " \"A\" button to load original firmware"); | 325 | lcd_puts(0, line++, " \"A\" button to load original firmware"); |
326 | line++; | ||
327 | snprintf(buf, sizeof(buf), "FRAME %x TTB %x", FRAME, TTB_BASE); | ||
328 | lcd_puts(0, line++, buf); | ||
326 | lcd_update(); | 329 | lcd_update(); |
327 | sleep(1*HZ); | 330 | sleep(1*HZ); |
328 | 331 | ||
@@ -334,7 +337,7 @@ void * main(void) | |||
334 | while(1); | 337 | while(1); |
335 | } | 338 | } |
336 | 339 | ||
337 | sleep(5*HZ); | 340 | sleep(1*HZ); |
338 | 341 | ||
339 | if(GPGDAT & 0x10) { | 342 | if(GPGDAT & 0x10) { |
340 | load_original = true; | 343 | load_original = true; |
@@ -434,7 +437,7 @@ load_rockbox: | |||
434 | map_memory(); | 437 | map_memory(); |
435 | lcd_puts(0, line, "Loading Rockbox..."); | 438 | lcd_puts(0, line, "Loading Rockbox..."); |
436 | lcd_update(); | 439 | lcd_update(); |
437 | sleep(HZ*4); | 440 | /* sleep(HZ*4); */ |
438 | 441 | ||
439 | // TODO: read those values from somwhere | 442 | // TODO: read those values from somwhere |
440 | loadbuffer = (unsigned char*) 0x100; | 443 | loadbuffer = (unsigned char*) 0x100; |
@@ -447,7 +450,7 @@ load_rockbox: | |||
447 | } else { | 450 | } else { |
448 | lcd_puts(0, line++, "Rockbox loaded."); | 451 | lcd_puts(0, line++, "Rockbox loaded."); |
449 | lcd_update(); | 452 | lcd_update(); |
450 | kernel_entry = (void*)0x100; | 453 | kernel_entry = (void*) loadbuffer; |
451 | rc = kernel_entry(); | 454 | rc = kernel_entry(); |
452 | snprintf(buf, sizeof(buf), "Woops, should not return from firmware: %d", rc); | 455 | snprintf(buf, sizeof(buf), "Woops, should not return from firmware: %d", rc); |
453 | lcd_puts(0, line++, buf); | 456 | lcd_puts(0, line++, buf); |