[PATCH u-boot-marvell 2/5] arm: mvebu: Guard non-AXP code by checking for AXP

[Stefan Roese]

On 08.09.22 16:06, Marek Behún wrote:
> From: Pali Rohár <pali at kernel.org>
> 
> 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 at kernel.org>
> Signed-off-by: Marek Behún <kabel at kernel.org>

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan


> ---
>   arch/arm/mach-mvebu/cpu.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
> index b512ccc501..8e5d1ba21e 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.

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de