[PATCH v5 7/8] rockchip: allow to build SPI images even without HAS_ROM option

[Kever Yang]

On 2022/8/26 23:36, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz at theobroma-systems.com>
>
> This prepares for the creation of a u-boot-rockchip-spi.bin image
> similar to u-boot-rockchip.bin to the exception it's destined for
> SPI-NOR flashes instead of MMC storage medium.
>
> Cc: Quentin Schulz <foss+uboot at 0leil.net>
> Signed-off-by: Quentin Schulz <quentin.schulz at theobroma-systems.com>

Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
>   arch/arm/dts/rk3288-u-boot.dtsi | 2 +-
>   arch/arm/dts/rk3399-u-boot.dtsi | 2 +-
>   arch/arm/mach-rockchip/Kconfig  | 6 ++----
>   3 files changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/dts/rk3288-u-boot.dtsi b/arch/arm/dts/rk3288-u-boot.dtsi
> index 9eb696b141..e411445ed6 100644
> --- a/arch/arm/dts/rk3288-u-boot.dtsi
> +++ b/arch/arm/dts/rk3288-u-boot.dtsi
> @@ -56,7 +56,7 @@
>   	};
>   };
>   
> -#ifdef CONFIG_ROCKCHIP_SPI_IMAGE
> +#if defined(CONFIG_ROCKCHIP_SPI_IMAGE) && defined(CONFIG_HAS_ROM)
>   &binman {
>   	rom {
>   		filename = "u-boot.rom";
> diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
> index 716b9a433a..3c1a15fe51 100644
> --- a/arch/arm/dts/rk3399-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-u-boot.dtsi
> @@ -60,7 +60,7 @@
>   
>   };
>   
> -#ifdef CONFIG_ROCKCHIP_SPI_IMAGE
> +#if defined(CONFIG_ROCKCHIP_SPI_IMAGE) && defined(CONFIG_HAS_ROM)
>   &binman {
>   	rom {
>   		filename = "u-boot.rom";
> diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
> index c561a77e6a..b46cea2f91 100644
> --- a/arch/arm/mach-rockchip/Kconfig
> +++ b/arch/arm/mach-rockchip/Kconfig
> @@ -425,12 +425,10 @@ config SPL_MMC
>   
>   config ROCKCHIP_SPI_IMAGE
>   	bool "Build a SPI image for rockchip"
> -	depends on HAS_ROM
>   	help
>   	  Some Rockchip SoCs support booting from SPI flash. Enable this
> -	  option to produce a 4MB SPI-flash image (called u-boot.rom)
> -	  containing U-Boot. The image is built by binman. U-Boot sits near
> -	  the start of the image.
> +	  option to produce a SPI-flash image containing U-Boot. The image
> +	  is built by binman. U-Boot sits near the start of the image.
>   
>   config LNX_KRNL_IMG_TEXT_OFFSET_BASE
>   	default SYS_TEXT_BASE