From: Pali Rohár <pali@kernel.org>
Date: Thu, 8 Sep 2022 14:06:51 +0000 (+0200)
Subject: arm: mvebu: Guard non-AXP code by checking for AXP
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=2a0d9ae414b4b2b38f6ada2d7a7134d7f31cff41;p=u-boot.git

arm: mvebu: Guard non-AXP code by checking for AXP

Commit c86d53fd88df ("arm: mvebu: Don't disable cache at startup on Armada
XP at all") introduced branch for non-AXP code which was guarded by A38X
condition. Fix this issue by checking for AXP platform, not by A38X.

Fixes: c86d53fd88df ("arm: mvebu: Don't disable cache at startup on Armada XP at all")
Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Marek Behún <kabel@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
---

diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index 7b722ca812..949bf21c9b 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -448,7 +448,7 @@ int arch_cpu_init(void)
 	struct pl310_regs *const pl310 =
 		(struct pl310_regs *)CONFIG_SYS_PL310_BASE;
 
-	if (IS_ENABLED(CONFIG_ARMADA_38X)) {
+	if (!IS_ENABLED(CONFIG_ARMADA_XP)) {
 		/*
 		 * To fully release / unlock this area from cache, we need
 		 * to flush all caches and disable the L2 cache.