diff options
-rw-r--r-- | firmware/target/arm/as3525/system-as3525.c | 8 |
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) | |||
161 | ); | 161 | ); |
162 | } | 162 | } |
163 | 163 | ||
164 | #if defined(BOOTLOADER) && (CONFIG_CPU == AS3525) /* not v2 */ | 164 | #if (CONFIG_CPU == AS3525) /* not v2 */ |
165 | #if defined(BOOTLOADER) | ||
165 | static void sdram_delay(void) | 166 | static void sdram_delay(void) |
166 | { | 167 | { |
167 | int delay = 1024; /* arbitrary */ | 168 | int delay = 1024; /* arbitrary */ |
@@ -233,7 +234,7 @@ static void sdram_init(void) | |||
233 | 234 | ||
234 | MPMC_DYNAMIC_CONFIG_0 |= (1<<19); /* buffer enable */ | 235 | MPMC_DYNAMIC_CONFIG_0 |= (1<<19); /* buffer enable */ |
235 | } | 236 | } |
236 | #else | 237 | #else /* !BOOTLOADER */ |
237 | void memory_init(void) | 238 | void memory_init(void) |
238 | { | 239 | { |
239 | ttb_init(); | 240 | ttb_init(); |
@@ -253,7 +254,8 @@ void memory_init(void) | |||
253 | 254 | ||
254 | enable_mmu(); | 255 | enable_mmu(); |
255 | } | 256 | } |
256 | #endif | 257 | #endif /* BOOTLOADER */ |
258 | #endif /* CONFIG_CPU == AS3525 (not v2) */ | ||
257 | 259 | ||
258 | void system_init(void) | 260 | void system_init(void) |
259 | { | 261 | { |