commit 2920359cca8a93814075d1bacecdbe9b8253f301
author Michael Sevakis <jethead71@rockbox.org> Mon Apr 21 04:34:39 2008 +0000
committer Michael Sevakis <jethead71@rockbox.org> Mon Apr 21 04:34:39 2008 +0000
tree 58b1884eab5774a51838770f015158c0a943ba86
parent e7999873f521eb902a267f02caf0a7e1e72ce864

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

bootloader/gigabeat-s.c

diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c
index 87d7d3e..b943b8c 100644
--- a/bootloader/gigabeat-s.c
+++ b/bootloader/gigabeat-s.c
@@ -156,7 +156,7 @@
 
     lcd_clear_display();
     printf("Hello world!");
-    printf("Gigabeat S Rockbox Bootloader v.00000008");
+    printf("Gigabeat S Rockbox Bootloader v.00000009");
     system_init();
     kernel_init();
     printf("kernel init done");

tools/mknkboot.c

diff --git a/tools/mknkboot.c b/tools/mknkboot.c
index 600f1ad..06bcbca 100644
--- a/tools/mknkboot.c
+++ b/tools/mknkboot.c
@@ -81,7 +81,7 @@
     0xe59f900c,      /* ldr     r9, [pc, #12] -> 0x53fa4000 */
     0xe5999000,      /* ldr     r9, [r9] */
     0xe3190010,      /* tst     r9, #16 ; 0x10 */
-#if 1
+#if 0
     /* Branch to Rockbox if hold is on */
     0x159ff004,      /* ldrne   pc, [pc, #4]  -> 0x89000000 */
 #else