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 branch 'master' of git://git.denx.de/u-boot-nand-flash
[oweals/u-boot.git]
/
arch
/
arm
/
lib
/
cache-cp15.c
diff --git
a/arch/arm/lib/cache-cp15.c
b/arch/arm/lib/cache-cp15.c
index 6ecbedfed96c33f3938131bd5a3dd7b60df9fd7f..4abe1cf061a879d65170ad8c6697d9c9e1954751 100644
(file)
--- a/
arch/arm/lib/cache-cp15.c
+++ b/
arch/arm/lib/cache-cp15.c
@@
-36,6
+36,10
@@
void __arm_init_before_mmu(void)
void arm_init_before_mmu(void)
__attribute__((weak, alias("__arm_init_before_mmu")));
void arm_init_before_mmu(void)
__attribute__((weak, alias("__arm_init_before_mmu")));
+__weak void arm_init_domains(void)
+{
+}
+
static void cp_delay (void)
{
volatile int i;
static void cp_delay (void)
{
volatile int i;
@@
-117,6
+121,9
@@
static inline void mmu_setup(void)
/* Set the access control to all-supervisor */
asm volatile("mcr p15, 0, %0, c3, c0, 0"
: : "r" (~0));
/* Set the access control to all-supervisor */
asm volatile("mcr p15, 0, %0, c3, c0, 0"
: : "r" (~0));
+
+ arm_init_domains();
+
/* and enable the mmu */
reg = get_cr(); /* get control reg. */
cp_delay();
/* and enable the mmu */
reg = get_cr(); /* get control reg. */
cp_delay();