[PATCH] rockchip: Ensure env in SPI Flash can work correctly

[Jonas Karlman]

Hi Kever,

Please consider this patch for v2026.01.

Also found at https://patchwork.ozlabs.org/patch/2110369/

Regards,
Jonas

On 7/12/2025 11:27 PM, Jonas Karlman wrote:
> Ensure that the spi/sfc node for SPI flash is aviliable during pre-reloc
> phase so that env can successfully be loaded from SPI Flash.
> 
> No boards with these SoCs seem to be affected as there is no default use
> of ENV_IS_IN_SPI_FLASH=y.
> 
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
> ---
>  arch/arm/dts/rk3328-u-boot.dtsi  | 4 ++++
>  arch/arm/dts/rk356x-u-boot.dtsi  | 1 +
>  arch/arm/dts/rk3588s-u-boot.dtsi | 1 +
>  3 files changed, 6 insertions(+)
> 
> diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi
> index b0e50a973a88..8ffc9ed3d573 100644
> --- a/arch/arm/dts/rk3328-u-boot.dtsi
> +++ b/arch/arm/dts/rk3328-u-boot.dtsi
> @@ -132,6 +132,10 @@
>  	bootph-pre-ram;
>  };
>  
> +&spi0 {
> +	bootph-some-ram;
> +};
> +
>  &uart2 {
>  	bootph-all;
>  	clock-frequency = <24000000>;
> diff --git a/arch/arm/dts/rk356x-u-boot.dtsi b/arch/arm/dts/rk356x-u-boot.dtsi
> index 871869739536..738b9673d352 100644
> --- a/arch/arm/dts/rk356x-u-boot.dtsi
> +++ b/arch/arm/dts/rk356x-u-boot.dtsi
> @@ -157,6 +157,7 @@
>  };
>  
>  &sfc {
> +	bootph-some-ram;
>  	u-boot,spl-sfc-no-dma;
>  };
>  
> diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi b/arch/arm/dts/rk3588s-u-boot.dtsi
> index 5eeb138f3513..71fd352f640e 100644
> --- a/arch/arm/dts/rk3588s-u-boot.dtsi
> +++ b/arch/arm/dts/rk3588s-u-boot.dtsi
> @@ -140,6 +140,7 @@
>  };
>  
>  &sfc {
> +	bootph-some-ram;
>  	u-boot,spl-sfc-no-dma;
>  };
>