From 2a5180535cb7c66ed3ca98d01db82df7c936b469 Mon Sep 17 00:00:00 2001 From: Lokesh Vutla Date: Thu, 26 Apr 2018 18:21:25 +0530 Subject: [PATCH] arm: v7: Update VBAR only if available Not all ARM V7 based cpus has VBAR for remapping vector base address. So, update VBAR only if it available. Reviewed-by: Tom Rini Signed-off-by: Lokesh Vutla --- arch/arm/cpu/armv7/start.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index f5df597e84..8c19a83f8b 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -72,9 +72,11 @@ switch_to_hypervisor_ret: bic r0, #CR_V @ V = 0 mcr p15, 0, r0, c1, c0, 0 @ Write CP15 SCTLR Register +#ifdef CONFIG_HAS_VBAR /* Set vector address in CP15 VBAR register */ ldr r0, =_start mcr p15, 0, r0, c12, c0, 0 @Set VBAR +#endif #endif /* the mask ROM code should have PLL and others stable */ -- 2.39.5