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 fcca360732beb122c4fd6e9347d97fb867e7ccb6..60c1aa90b6b97d6f133b62a3e7820df47ff8af03 100644
(file)
--- a/
cpu/arm720t/cpu.c
+++ b/
cpu/arm720t/cpu.c
@@
-73,9
+73,11
@@
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 */
disable_interrupts ();
/* Nothing more needed */
+#elif defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_INTEGRATOR)
+ /* No cleanup before linux for IntegratorAP/CM720T as yet */
#else
#error No cleanup_before_linux() defined for this CPU type
#endif
#else
#error No cleanup_before_linux() defined for this CPU type
#endif
@@
-245,6
+247,12
@@
int dcache_status (void)
return icache_status();
}
return icache_status();
}
+#elif defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_INTEGRATOR)
+ /* No specific cache setup for IntegratorAP/CM720T as yet */
+ 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