[PATCH 1/2] arm: mvebu: axp: Properly check for Armada XP in mach/soc.h

Stefan Roese sr at denx.de
Wed Sep 1 11:09:13 CEST 2021


On 11.08.21 20:53, Pali Rohár wrote:
> File mach/soc.h is included also in 64-bit mvebu processors, so define
> Armada XP related macros only when compiling for Armada XP.
> 
> Signed-off-by: Pali Rohár <pali at kernel.org>

Applied to u-boot-marvell/master

Thanks,
Stefan

> ---
>   arch/arm/mach-mvebu/include/mach/soc.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h
> index 8e8a4058550e..aab61f7c15cf 100644
> --- a/arch/arm/mach-mvebu/include/mach/soc.h
> +++ b/arch/arm/mach-mvebu/include/mach/soc.h
> @@ -189,7 +189,7 @@
>   #define BOOT_FROM_SPI		0x3
>   
>   #define CONFIG_SYS_TCLK		200000000	/* 200MHz */
> -#else
> +#elif defined(CONFIG_ARMADA_XP)
>   /* SAR values for Armada XP */
>   #define CONFIG_SAR_REG		(MVEBU_REGISTER(0x18230))
>   #define CONFIG_SAR2_REG		(MVEBU_REGISTER(0x18234))
> 


Viele Grüße,
Stefan

-- 
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


More information about the U-Boot mailing list