summaryrefslogtreecommitdiff
path: root/firmware/target/arm/as3525
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2010-02-07 18:37:15 +0000
committerRafaël Carré <rafael.carre@gmail.com>2010-02-07 18:37:15 +0000
commitbd0b7363ca28d3202338bb5f434b89f8d08a5e2b (patch)
treebb0979a50a8d34b01667a086faa64db54a5f85dd /firmware/target/arm/as3525
parent20412a3bb4144fb40c0c8ca8713d3aa3ab41a3c6 (diff)
Sansa AMS: do not init memory for AS3525v2
(#ifdef rule was broken) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24549 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/as3525')
-rw-r--r--firmware/target/arm/as3525/system-as3525.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/firmware/target/arm/as3525/system-as3525.c b/firmware/target/arm/as3525/system-as3525.c
index 23c65ae041..7c729d4468 100644
--- a/firmware/target/arm/as3525/system-as3525.c
+++ b/firmware/target/arm/as3525/system-as3525.c
@@ -161,7 +161,8 @@ void fiq_handler(void)
);
}
-#if defined(BOOTLOADER) && (CONFIG_CPU == AS3525) /* not v2 */
+#if (CONFIG_CPU == AS3525) /* not v2 */
+#if defined(BOOTLOADER)
static void sdram_delay(void)
{
int delay = 1024; /* arbitrary */
@@ -233,7 +234,7 @@ static void sdram_init(void)
MPMC_DYNAMIC_CONFIG_0 |= (1<<19); /* buffer enable */
}
-#else
+#else /* !BOOTLOADER */
void memory_init(void)
{
ttb_init();
@@ -253,7 +254,8 @@ void memory_init(void)
enable_mmu();
}
-#endif
+#endif /* BOOTLOADER */
+#endif /* CONFIG_CPU == AS3525 (not v2) */
void system_init(void)
{