[PATCH] arm: mvebu: Define env_sf_get_env_addr() for all Armada boards in SPL

[Stefan Roese]

On 08.08.22 19:13, Pali Rohár wrote:
> SPI0 CS0 Flash is mapped to address range 0xD4000000 - 0xD7FFFFFF by BootROM.
> Proper U-Boot removes this direct mapping. So it is available only in SPL.
> This applies for all 32-bit Armada BootROMs. SPL mvebu code is used only on
> 32-bit Armada SoCs. So move env_sf_get_env_addr() function from Turris
> Omnia board to common SPL mvebu code and add proper checks for SPI0 CS0.
> 
> Signed-off-by: Pali Rohár <pali at kernel.org>

Applied to u-boot-marvell/master

Thanks,
Stefan

> ---
>   arch/arm/mach-mvebu/spl.c                | 13 +++++++++++++
>   board/CZ.NIC/turris_omnia/turris_omnia.c | 10 ----------
>   2 files changed, 13 insertions(+), 10 deletions(-)
> 
> diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c
> index 13c99913c380..866e0ac62345 100644
> --- a/arch/arm/mach-mvebu/spl.c
> +++ b/arch/arm/mach-mvebu/spl.c
> @@ -292,6 +292,19 @@ int board_return_to_bootrom(struct spl_image_info *spl_image,
>   	hang();
>   }
>   
> +/*
> + * SPI0 CS0 Flash is mapped to address range 0xD4000000 - 0xD7FFFFFF by BootROM.
> + * Proper U-Boot removes this direct mapping. So it is available only in SPL.
> + */
> +#if defined(CONFIG_SPL_ENV_IS_IN_SPI_FLASH) && \
> +    CONFIG_ENV_SPI_BUS == 0 && CONFIG_ENV_SPI_CS == 0 && \
> +    CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE <= 64*1024*1024
> +void *env_sf_get_env_addr(void)
> +{
> +	return (void *)0xD4000000 + CONFIG_ENV_OFFSET;
> +}
> +#endif
> +
>   void board_init_f(ulong dummy)
>   {
>   	int ret;
> diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
> index 5921769f1e1d..3180305f8031 100644
> --- a/board/CZ.NIC/turris_omnia/turris_omnia.c
> +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
> @@ -255,16 +255,6 @@ static bool omnia_detect_wwan_usb3(const char *wwan_slot)
>   	return false;
>   }
>   
> -void *env_sf_get_env_addr(void)
> -{
> -	/* SPI Flash is mapped to address 0xD4000000 only in SPL */
> -#ifdef CONFIG_SPL_BUILD
> -	return (void *)0xD4000000 + CONFIG_ENV_OFFSET;
> -#else
> -	return NULL;
> -#endif
> -}
> -
>   int hws_board_topology_load(struct serdes_map **serdes_map_array, u8 *count)
>   {
>   #ifdef CONFIG_SPL_ENV_SUPPORT

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