[PATCH master] ARM: rockchip: don't attempt building MACH_RADXA_ROCK5 without firmware

[PATCH master] ARM: rockchip: don't attempt building MACH_RADXA_ROCK5 without firmware

[Ahmad Fatoum]

Otherwise, multi_v8_defconfig would give errors for users that are only
interested in using it for qemu-virt64, which requires no external
firmware to be built into barebox.

While at it, fix spaces to tabs to be in-line with the rest of the file.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/arm/mach-rockchip/Kconfig | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 38736102d334..a71c4ae35dd9 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -102,9 +102,10 @@ config MACH_RADXA_ROCK3
 	  Say Y here if you are using a Radxa ROCK3
 
 config MACH_RADXA_ROCK5
-       select ARCH_RK3588
-       bool "Radxa ROCK5"
-       help
+	select ARCH_RK3588
+	depends on $(success,test -e $(srctree)/arch/arm/boards/radxa-rock5/sdram-init.bin)
+	bool "Radxa ROCK5"
+	help
 	  Say Y here if you are using a Radxa ROCK5
 
 config MACH_RADXA_CM3
-- 
2.39.2

Re: [PATCH master] ARM: rockchip: don't attempt building MACH_RADXA_ROCK5 without firmware

[Sascha Hauer]

On Tue, May 23, 2023 at 11:41:24AM +0200, Ahmad Fatoum wrote:
> Otherwise, multi_v8_defconfig would give errors for users that are only
> interested in using it for qemu-virt64, which requires no external
> firmware to be built into barebox.
> 
> While at it, fix spaces to tabs to be in-line with the rest of the file.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  arch/arm/mach-rockchip/Kconfig | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
> index 38736102d334..a71c4ae35dd9 100644
> --- a/arch/arm/mach-rockchip/Kconfig
> +++ b/arch/arm/mach-rockchip/Kconfig
> @@ -102,9 +102,10 @@ config MACH_RADXA_ROCK3
>  	  Say Y here if you are using a Radxa ROCK3
>  
>  config MACH_RADXA_ROCK5
> -       select ARCH_RK3588
> -       bool "Radxa ROCK5"
> -       help
> +	select ARCH_RK3588
> +	depends on $(success,test -e $(srctree)/arch/arm/boards/radxa-rock5/sdram-init.bin)
> +	bool "Radxa ROCK5"
> +	help
>  	  Say Y here if you are using a Radxa ROCK5
>  
>  config MACH_RADXA_CM3
> -- 
> 2.39.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |