summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2008-04-21 04:34:39 +0000
committerMichael Sevakis <jethead71@rockbox.org>2008-04-21 04:34:39 +0000
commit2920359cca8a93814075d1bacecdbe9b8253f301 (patch)
tree58b1884eab5774a51838770f015158c0a943ba86
parente7999873f521eb902a267f02caf0a7e1e72ce864 (diff)
downloadrockbox-2920359cca8a93814075d1bacecdbe9b8253f301.tar.gz
rockbox-2920359cca8a93814075d1bacecdbe9b8253f301.zip
Unreverse Gigabeat S bootloader. Boot Rockbox with hold switch off.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17203 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--bootloader/gigabeat-s.c2
-rw-r--r--tools/mknkboot.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c
index 87d7d3e56c..b943b8cd2c 100644
--- a/bootloader/gigabeat-s.c
+++ b/bootloader/gigabeat-s.c
@@ -156,7 +156,7 @@ void main(void)
156 156
157 lcd_clear_display(); 157 lcd_clear_display();
158 printf("Hello world!"); 158 printf("Hello world!");
159 printf("Gigabeat S Rockbox Bootloader v.00000008"); 159 printf("Gigabeat S Rockbox Bootloader v.00000009");
160 system_init(); 160 system_init();
161 kernel_init(); 161 kernel_init();
162 printf("kernel init done"); 162 printf("kernel init done");
diff --git a/tools/mknkboot.c b/tools/mknkboot.c
index 600f1adb1a..06bcbca2a5 100644
--- a/tools/mknkboot.c
+++ b/tools/mknkboot.c
@@ -81,7 +81,7 @@ static uint32_t dualboot[] =
81 0xe59f900c, /* ldr r9, [pc, #12] -> 0x53fa4000 */ 81 0xe59f900c, /* ldr r9, [pc, #12] -> 0x53fa4000 */
82 0xe5999000, /* ldr r9, [r9] */ 82 0xe5999000, /* ldr r9, [r9] */
83 0xe3190010, /* tst r9, #16 ; 0x10 */ 83 0xe3190010, /* tst r9, #16 ; 0x10 */
84#if 1 84#if 0
85 /* Branch to Rockbox if hold is on */ 85 /* Branch to Rockbox if hold is on */
86 0x159ff004, /* ldrne pc, [pc, #4] -> 0x89000000 */ 86 0x159ff004, /* ldrne pc, [pc, #4] -> 0x89000000 */
87#else 87#else