summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2008-11-10 09:50:25 +0000
committerDaniel Stenberg <daniel@haxx.se>2008-11-10 09:50:25 +0000
commit55634f74106d331b88b54fd175d9fb19f7726ecc (patch)
tree01039c92c094911e653893428a1e9599a9fd13c8
parent13319cdb82b2a405b64274070d8773a1944ed665 (diff)
downloadrockbox-55634f74106d331b88b54fd175d9fb19f7726ecc.tar.gz
rockbox-55634f74106d331b88b54fd175d9fb19f7726ecc.zip
grrr, I need to learn to do case insensitive grepping when that's the better idea...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19062 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/as3525/system-as3525.c2
-rw-r--r--rbutil/mkamsboot/dualboot.S4
2 files changed, 3 insertions, 3 deletions
diff --git a/firmware/target/arm/as3525/system-as3525.c b/firmware/target/arm/as3525/system-as3525.c
index a4208c709e..e79dd460fa 100644
--- a/firmware/target/arm/as3525/system-as3525.c
+++ b/firmware/target/arm/as3525/system-as3525.c
@@ -167,7 +167,7 @@ static void sdram_init(void)
MPMC_DYNAMIC_tRRD = 2;
MPMC_DYNAMIC_tMRD = 2;
-#if defined(SANSA_CLIP) || defined(SANSA_M200V2) || defined(SANSA_FUZE)
+#if defined(SANSA_CLIP) || defined(SANSA_M200V4) || defined(SANSA_FUZE)
# define MEMORY_MODEL 0x21
/* 16 bits external bus, low power SDRAM, 16 Mbits = 2 Mbytes */
#elif defined(SANSA_E200V2)
diff --git a/rbutil/mkamsboot/dualboot.S b/rbutil/mkamsboot/dualboot.S
index 13abece1d9..c421aa53b1 100644
--- a/rbutil/mkamsboot/dualboot.S
+++ b/rbutil/mkamsboot/dualboot.S
@@ -78,7 +78,7 @@ uclcopy:
str r1, [r0]
-#ifndef SANSA_M200V2 /* this doesnt work for m200 */
+#ifndef SANSA_M200V4 /* this doesnt work for m200 */
/* we check A3 unconditionally of the model because it seems to be */
/* either hold, either usb on every model */
@@ -118,7 +118,7 @@ uclcopy:
cmp r1, #0 /* C3 = #0 means button pressed */
beq boot_of
-#elif defined(SANSA_M200V2)
+#elif defined(SANSA_M200V4)
/* SELECT button */
.set row, (1<<5) /* enable output on A5 */
ldr r0, =GPIOA