mach-sc5xx: Kconfig: Make EZKIT and EZLITE carriers mutually exclusive

Support for the SOM-CRR variants introduces library level changes that
are not modelled in the device tree. As a result they cannot both be
selected at the same time, so this updates the dependency in Kconfig to
prevent them from being enabled together.

Reported-by: Philip Molloy <Philip.Molloy@analog.com>
Signed-off-by: Greg Malysa <malysagreg@gmail.com>

diff --git a/arch/arm/mach-sc5xx/Kconfig b/arch/arm/mach-sc5xx/Kconfig
index 170177f4e10a3f204c1a4a98b99db1cbeaec4f78..b7c298fe27923ae78a12a6fea787b4800680b1e6 100644 (file)
--- a/arch/arm/mach-sc5xx/Kconfig
+++ b/arch/arm/mach-sc5xx/Kconfig
@@ -241,21 +241,27 @@ config ADI_BUG_EZKHW21
          This workaround affects the SC584 EZKIT and addresses bug EZKHW21.
          It disables gigabit ethernet mode and limits the board to 100 Mbps
 
+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"
-       depends on (SC59X || SC59X_64)
        help
          Say y to include support for the EV-SOMCRR-EZKIT carrier board,
-         which is compatible with the SC594 and SC598 SOMs. The EZKIT is
-         mutually incompatible with the EZLITE.
+         which is compatible with the SC594 and SC598 SOMs.
 
 config ADI_CARRIER_SOMCRR_EZLITE
        bool "Support the EV-SOMCRR-EZLITE"
-       depends on (SC59X || SC59X_64)
        help
          Say y to include support for the EV-SOMCRR-EZLITE carrier board,
-         which is compatible with the SC594 and SC598 SOMs. The EZLITE is
-         mutually incompatible with the EZKIT.
+         which is compatible with the SC594 and SC598 SOMs.
+
+endchoice
 
 config ADI_SPL_FORCE_BMODE
        int "Force the SPL to use this BMODE device during next boot stage"