summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Guay <marcguay@rockbox.org>2009-05-27 22:32:39 +0000
committerMarc Guay <marcguay@rockbox.org>2009-05-27 22:32:39 +0000
commit64595105b1e63eedcd0c47290cf6c0d5e7e4cd46 (patch)
treeea83440d203616bb421222b0fb6ebf2940d60c88
parent57c371ee0e49e0fff38bc77b0d52aa890e18ca5c (diff)
downloadrockbox-64595105b1e63eedcd0c47290cf6c0d5e7e4cd46.tar.gz
rockbox-64595105b1e63eedcd0c47290cf6c0d5e7e4cd46.zip
Set up the c100 for dual-booting.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21105 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/export/config-c100.h4
-rw-r--r--firmware/target/arm/tcc77x/crt0.S4
2 files changed, 6 insertions, 2 deletions
diff --git a/firmware/export/config-c100.h b/firmware/export/config-c100.h
index cedc7c3aed..1fe1a6ca64 100644
--- a/firmware/export/config-c100.h
+++ b/firmware/export/config-c100.h
@@ -124,4 +124,8 @@
124#define BOOTFILE "rockbox." BOOTFILE_EXT 124#define BOOTFILE "rockbox." BOOTFILE_EXT
125#define BOOTDIR "/" 125#define BOOTDIR "/"
126 126
127#ifdef BOOTLOADER
128#define TCCBOOT
129#endif
130
127#endif /* SIMULATOR */ 131#endif /* SIMULATOR */
diff --git a/firmware/target/arm/tcc77x/crt0.S b/firmware/target/arm/tcc77x/crt0.S
index 68946eb6fa..2c5af3f21b 100644
--- a/firmware/target/arm/tcc77x/crt0.S
+++ b/firmware/target/arm/tcc77x/crt0.S
@@ -63,7 +63,7 @@ bl_entrypoint: .word 0 /* Location in RAM of the start of our bootloader */
63 .word 0 /* Second CRC32 */ 63 .word 0 /* Second CRC32 */
64 .word 0 /* length of firmware file */ 64 .word 0 /* length of firmware file */
65 65
66#ifdef LOGIK_DAX 66#if defined(LOGIK_DAX) || defined(SANSA_C100)
67 /* Some original firmwares have 0x40 bytes of zeroes here - we 67 /* Some original firmwares have 0x40 bytes of zeroes here - we
68 don't know why, but err on the side of caution and include it 68 don't know why, but err on the side of caution and include it
69 here. */ 69 here. */
@@ -83,7 +83,7 @@ start_loc:
83 83
84#ifdef TCCBOOT 84#ifdef TCCBOOT
85 mov r0, #0x80000000 85 mov r0, #0x80000000
86#if defined(LOGIK_DAX) 86#if defined(LOGIK_DAX) || defined(SANSA_C100)
87 ldr r0, [r0, #0x300] /* Hold button is GPIO A, pin 0x2 */ 87 ldr r0, [r0, #0x300] /* Hold button is GPIO A, pin 0x2 */
88 tst r0, #0x2 88 tst r0, #0x2
89#elif defined(SANSA_M200) 89#elif defined(SANSA_M200)