diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2019-01-17 16:38:25 -0800 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-21 10:34:06 +0100 |
| commit | 7aeebcb3ba069bf9c8bb699630928ee84ba60bc4 (patch) | |
| tree | 45e2cb47299d7d5b371a5bf476c955f2c7530efc /arch/arm/cpu/mmu.c | |
| parent | f6cfdf9288238ce61b9103cbeb9c63275b39b69f (diff) | |
| download | barebox-7aeebcb3ba069bf9c8bb699630928ee84ba60bc4.tar.gz barebox-7aeebcb3ba069bf9c8bb699630928ee84ba60bc4.tar.xz | |
ARM: mmu: Share sanity checking code in mmu_init()
Share sanity checking code in mmu_init() as well as code to detect if
MMU is on or not on both ARM and ARM64.
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/cpu/mmu.c')
| -rw-r--r-- | arch/arm/cpu/mmu.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/arch/arm/cpu/mmu.c b/arch/arm/cpu/mmu.c index 97c459ff0c..ba1c3e007d 100644 --- a/arch/arm/cpu/mmu.c +++ b/arch/arm/cpu/mmu.c @@ -412,19 +412,10 @@ static void vectors_init(void) /* * Prepare MMU for usage enable it. */ -static int mmu_init(void) +void __mmu_init(bool mmu_on) { struct memory_bank *bank; - if (list_empty(&memory_banks)) - /* - * If you see this it means you have no memory registered. - * This can be done either with arm_add_mem_device() in an - * initcall prior to mmu_initcall or via devicetree in the - * memory node. - */ - panic("MMU: No memory bank found! Cannot continue\n"); - arm_set_cache_functions(); if (cpu_architecture() >= CPU_ARCH_ARMv7) { @@ -439,7 +430,7 @@ static int mmu_init(void) pte_flags_uncached = PTE_FLAGS_UNCACHED_V4; } - if (get_cr() & CR_M) { + if (mmu_on) { /* * Early MMU code has already enabled the MMU. We assume a * flat 1:1 section mapping in this case. @@ -483,10 +474,7 @@ static int mmu_init(void) } __mmu_cache_on(); - - return 0; } -mmu_initcall(mmu_init); /* * Clean and invalide caches, disable MMU |