projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'wd/master'
[oweals/u-boot.git]
/
cpu
/
arm720t
/
cpu.c
diff --git
a/cpu/arm720t/cpu.c
b/cpu/arm720t/cpu.c
index a5b6de7605525783eebe3608170f8cfa255cc2f8..60c1aa90b6b97d6f133b62a3e7820df47ff8af03 100644
(file)
--- a/
cpu/arm720t/cpu.c
+++ b/
cpu/arm720t/cpu.c
@@
-73,7
+73,7
@@
int cleanup_before_linux (void)
/* go to high speed */
IO_SYSCON3 = (IO_SYSCON3 & ~CLKCTL) | CLKCTL_73;
#endif
/* go to high speed */
IO_SYSCON3 = (IO_SYSCON3 & ~CLKCTL) | CLKCTL_73;
#endif
-#elif defined(CONFIG_NETARM) || defined(CONFIG_S3C4510B)
+#elif defined(CONFIG_NETARM) || defined(CONFIG_S3C4510B)
|| defined(CONFIG_LPC2292)
disable_interrupts ();
/* Nothing more needed */
#elif defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_INTEGRATOR)
disable_interrupts ();
/* Nothing more needed */
#elif defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_INTEGRATOR)
@@
-252,6
+252,7
@@
int dcache_status (void)
void icache_enable (void)
{
}
void icache_enable (void)
{
}
+#elif defined(CONFIG_LPC2292) /* just to satisfy the compiler */
#else
#error No icache/dcache enable/disable functions defined for this CPU type
#endif
#else
#error No icache/dcache enable/disable functions defined for this CPU type
#endif