From: Simon Glass Date: Wed, 31 May 2017 23:57:13 +0000 (-0600) Subject: arm: Don't try to support CONFIG_ARMV7_LPAE on ARMv4T X-Git-Tag: v2017.07-rc2~54^2~26 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=10d602ac8b6f576d545e35a951e1a714de0158a3;p=u-boot arm: Don't try to support CONFIG_ARMV7_LPAE on ARMv4T At present if CONFIG_ARMV7_LPAE is defined then mmu_setup() will use instructions which are invalid on ARMv4T. This happens on Tegra since it has an ARMv4T boot CPU. Add a check for the architecture version to allow the code to be built. It will not actually be executed by the boot CPU, but needs to compile. Signed-off-by: Simon Glass --- diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c index 0f7020a315..f293573601 100644 --- a/arch/arm/lib/cache-cp15.c +++ b/arch/arm/lib/cache-cp15.c @@ -129,7 +129,7 @@ static inline void mmu_setup(void) dram_bank_mmu_setup(i); } -#ifdef CONFIG_ARMV7_LPAE +#if defined(CONFIG_ARMV7_LPAE) && __LINUX_ARM_ARCH__ != 4 /* Set up 4 PTE entries pointing to our 4 1GB page tables */ for (i = 0; i < 4; i++) { u64 *page_table = (u64 *)(gd->arch.tlb_addr + (4096 * 4));