diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2008-11-11 11:01:55 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2008-11-11 11:01:55 +0000 |
commit | ce505b8a01d3fcebeab5bcced0688d62eae1083e (patch) | |
tree | adc78b407d64dca0e9e053d7caa2f262e6dbd92d | |
parent | d5ea63a1e89c60f732834d82ece8aca67564756c (diff) | |
download | rockbox-ce505b8a01d3fcebeab5bcced0688d62eae1083e.tar.gz rockbox-ce505b8a01d3fcebeab5bcced0688d62eae1083e.zip |
the delay in the as3525 bootloader was driving me mad so remove it and get the bootloader closer to where a "finished" one should be (only show info if sometrhing needs to be shown, which is always for now.)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19085 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | bootloader/common.c | 2 | ||||
-rw-r--r-- | bootloader/sansa_as3525.c | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/bootloader/common.c b/bootloader/common.c index c792267afa..906b5e0af7 100644 --- a/bootloader/common.c +++ b/bootloader/common.c | |||
@@ -34,7 +34,7 @@ | |||
34 | on a button press - currently only the ipod, H10 and Sansa versions do. */ | 34 | on a button press - currently only the ipod, H10 and Sansa versions do. */ |
35 | #if defined(IPOD_ARCH) || defined(IRIVER_H10) || defined(IRIVER_H10_5GB) \ | 35 | #if defined(IPOD_ARCH) || defined(IRIVER_H10) || defined(IRIVER_H10_5GB) \ |
36 | || defined(SANSA_E200) || defined(SANSA_C200) || defined(GIGABEAT_F) \ | 36 | || defined(SANSA_E200) || defined(SANSA_C200) || defined(GIGABEAT_F) \ |
37 | || defined(PHILIPS_SA9200) | 37 | || defined(PHILIPS_SA9200) || (CONFIG_CPU == AS3525) |
38 | bool verbose = false; | 38 | bool verbose = false; |
39 | #else | 39 | #else |
40 | bool verbose = true; | 40 | bool verbose = true; |
diff --git a/bootloader/sansa_as3525.c b/bootloader/sansa_as3525.c index e6152c7448..d59e7e7183 100644 --- a/bootloader/sansa_as3525.c +++ b/bootloader/sansa_as3525.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include "config.h" | 28 | #include "config.h" |
29 | #include "lcd.h" | 29 | #include "lcd.h" |
30 | #include "backlight-target.h" | 30 | #include "backlight-target.h" |
31 | #include "button-target.h" | ||
31 | #include "ascodec-target.h" | 32 | #include "ascodec-target.h" |
32 | #include "common.h" | 33 | #include "common.h" |
33 | #include "storage.h" | 34 | #include "storage.h" |
@@ -41,7 +42,6 @@ void main(void) | |||
41 | int buffer_size; | 42 | int buffer_size; |
42 | void(*kernel_entry)(void); | 43 | void(*kernel_entry)(void); |
43 | int ret; | 44 | int ret; |
44 | int delay; | ||
45 | 45 | ||
46 | system_init(); | 46 | system_init(); |
47 | kernel_init(); | 47 | kernel_init(); |
@@ -52,9 +52,16 @@ void main(void) | |||
52 | ascodec_init(); /* Required for backlight on e200v2 */ | 52 | ascodec_init(); /* Required for backlight on e200v2 */ |
53 | _backlight_on(); | 53 | _backlight_on(); |
54 | 54 | ||
55 | delay = 0x3000000; | 55 | #if 0 /* remove me when the bootloader can be considered finished */ |
56 | while(delay--); /* show splash screen */ | 56 | int btn = button_read_device(); |
57 | reset_screen(); | 57 | |
58 | /* Enable bootloader messages if any button is pressed */ | ||
59 | if (btn) | ||
60 | #endif | ||
61 | { | ||
62 | lcd_clear_display(); | ||
63 | verbose = true; | ||
64 | } | ||
58 | 65 | ||
59 | asm volatile( | 66 | asm volatile( |
60 | "mrs r0, cpsr \n" | 67 | "mrs r0, cpsr \n" |