From bd0b7363ca28d3202338bb5f434b89f8d08a5e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Sun, 7 Feb 2010 18:37:15 +0000 Subject: [PATCH] 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 --- firmware/target/arm/as3525/system-as3525.c | 8 +++++--- 1 file 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) {