diff options
Diffstat (limited to 'firmware/rolo.c')
-rw-r--r-- | firmware/rolo.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/firmware/rolo.c b/firmware/rolo.c index a8ea1cdf5e..87e6958fca 100644 --- a/firmware/rolo.c +++ b/firmware/rolo.c | |||
@@ -115,7 +115,7 @@ static void rolo_error(const char *text) | |||
115 | /* these are in assembler file "descramble.S" for SH7034 */ | 115 | /* these are in assembler file "descramble.S" for SH7034 */ |
116 | extern unsigned short descramble(const unsigned char* source, | 116 | extern unsigned short descramble(const unsigned char* source, |
117 | unsigned char* dest, int length); | 117 | unsigned char* dest, int length); |
118 | /* this is in firmware/target/arm/imx31/rolo_restart.S for IMX31 */ | 118 | /* this is in firmware/target/arm/imx31/rolo_restart.c for IMX31 */ |
119 | extern void rolo_restart(const unsigned char* source, unsigned char* dest, | 119 | extern void rolo_restart(const unsigned char* source, unsigned char* dest, |
120 | int length); | 120 | int length); |
121 | #else | 121 | #else |
@@ -300,6 +300,7 @@ int rolo_load(const char* filename) | |||
300 | #endif | 300 | #endif |
301 | adc_close(); | 301 | adc_close(); |
302 | 302 | ||
303 | #if CONFIG_CPU != IMX31L /* We're not finished yet */ | ||
303 | #ifdef CPU_ARM | 304 | #ifdef CPU_ARM |
304 | /* Should do these together since some ARM version should never have | 305 | /* Should do these together since some ARM version should never have |
305 | * FIQ disabled and not IRQ (imx31 errata). */ | 306 | * FIQ disabled and not IRQ (imx31 errata). */ |
@@ -308,6 +309,7 @@ int rolo_load(const char* filename) | |||
308 | /* Some targets have a higher disable level than HIGEST_IRQ_LEVEL */ | 309 | /* Some targets have a higher disable level than HIGEST_IRQ_LEVEL */ |
309 | set_irq_level(DISABLE_INTERRUPTS); | 310 | set_irq_level(DISABLE_INTERRUPTS); |
310 | #endif | 311 | #endif |
312 | #endif /* CONFIG_CPU == IMX31L */ | ||
311 | 313 | ||
312 | #else /* CONFIG_CPU == SH7034 */ | 314 | #else /* CONFIG_CPU == SH7034 */ |
313 | /* Read file length from header and compare to real file length */ | 315 | /* Read file length from header and compare to real file length */ |