From: Caleb Ethridge <[email protected]>
The TARGET_SC5xx_SOM_* board options pick their carrier board with
"select ADI_CARRIER_SOMCRR_*", but the carrier options are members of a
choice and Kconfig ignores select on choice values. The carrier always
fell back to the choice default instead, so the sc594-som-ezlite was built
with the EZKIT carrier code.
Turn the carrier options into plain bool symbols so that we can
leverage the existing selects in the board targets.
Fixes: 9e24d9a61560 ("arm: SC594-SOM-EZLITE initial support")
Signed-off-by: Caleb Ethridge <[email protected]>
---
arch/arm/mach-sc5xx/Kconfig | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/arch/arm/mach-sc5xx/Kconfig b/arch/arm/mach-sc5xx/Kconfig
index cf154c221eb..fe19eb5ff66 100644
--- a/arch/arm/mach-sc5xx/Kconfig
+++ b/arch/arm/mach-sc5xx/Kconfig
@@ -216,29 +216,19 @@ config ADI_CARRIER_SOMCRR_COMMON
Common code shared by the EV-SOMCRR carrier board support.
Selected by the carrier board options.
-choice
- prompt "Analog Devices SOM Carrier Board Variant"
- depends on (SC59X || SC59X_64)
- default ADI_CARRIER_SOMCRR_EZKIT
- help
- Select the specific EV-SOMCRR carrier board that you are using.
- Using a SOM without a carrier board is not supported.
-
config ADI_CARRIER_SOMCRR_EZKIT
- bool "Support the EV-SOMCRR-EZKIT"
+ bool
select ADI_CARRIER_SOMCRR_COMMON
help
- Say y to include support for the EV-SOMCRR-EZKIT carrier board,
- which is compatible with the SC594 and SC598 SOMs.
+ Support for the EV-SOMCRR-EZKIT carrier board, which is compatible
+ with the SC594 and SC598 SOMs. Selected by the board target.
config ADI_CARRIER_SOMCRR_EZLITE
- bool "Support the EV-SOMCRR-EZLITE"
+ bool
select ADI_CARRIER_SOMCRR_COMMON
help
- Say y to include support for the EV-SOMCRR-EZLITE carrier board,
- which is compatible with the SC594 and SC598 SOMs.
-
-endchoice
+ Support for the EV-SOMCRR-EZLITE carrier board, which is compatible
+ with the SC594 and SC598 SOMs. Selected by the board target.
config ADI_SPL_FORCE_BMODE
int "Force the SPL to use this BMODE device during next boot stage"
--
2.43.0
