summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/mmu-early.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/cpu/mmu-early.c')
-rw-r--r--arch/arm/cpu/mmu-early.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/cpu/mmu-early.c b/arch/arm/cpu/mmu-early.c
index 7c30526b94..b985aa455f 100644
--- a/arch/arm/cpu/mmu-early.c
+++ b/arch/arm/cpu/mmu-early.c
@@ -58,5 +58,12 @@ void mmu_early_enable(unsigned long membase, unsigned long memsize,
/* maps main memory as cachable */
map_region(membase, memsize, PMD_SECT_DEF_CACHED);
+ /*
+ * With HAB enabled we call into the ROM code later in imx6_hab_get_status().
+ * Map the ROM cached which has the effect that the XN bit is not set.
+ */
+ if (IS_ENABLED(CONFIG_HABV4) && IS_ENABLED(CONFIG_ARCH_IMX6))
+ map_region(0x0, SZ_1M, PMD_SECT_DEF_CACHED);
+
__mmu_cache_on();
}