arm: mach-sc5xx: clean up Kconfig

Moves common options between all SC5xx series boards to the ARCH_SC5XX
option instead of duplicating them.

Also, it was possible to select multiple of the SoC support options.
Given a U-Boot binary can only support a single platform, this moves
the SoC selection to a `choice`, making them mutually exclusive.

Signed-off-by: Oliver Gaskell <Oliver.Gaskell@analog.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ba0359fed5adb5401ef94ea1b4eb6c3bc03d5f1c..72960126ee259fd67df711984f703a3dafefea0d 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1868,6 +1868,14 @@ config TARGET_LS1046AFRWY
 
 config ARCH_SC5XX
        bool "Analog Devices SC5XX-processor family"
+       select ADI_SC5XX_TIMER
+       select DM
+       select DM_SERIAL
+       select PANIC_HANG
+       select SPL
+       select SPL_DM
+       select SUPPORT_SPL
+       select TIMER
 
 config TARGET_SL28
        bool "Support sl28"

diff --git a/arch/arm/mach-sc5xx/Kconfig b/arch/arm/mach-sc5xx/Kconfig
index 3846b4fd5b6efa77fc66428a904226182d8c69d6..2ec09dbf3eebc699754374bf115426adbe3bc7bb 100644 (file)
--- a/arch/arm/mach-sc5xx/Kconfig
+++ b/arch/arm/mach-sc5xx/Kconfig
@@ -13,47 +13,38 @@
 
 if ARCH_SC5XX
 
+choice
+       prompt "SC5xx SoC Select"
+       help
+         Selects which series of Analog Devices SC5xx chips to support.
+
 config SC57X
-       bool
-       select SUPPORT_SPL
-       select CPU_V7A
-       select PANIC_HANG
+       bool "SC57x series"
        select COMMON_CLK_ADI_SC57X
-       select TIMER
-       select ADI_SC5XX_TIMER
+       select CPU_V7A
 
 config SC58X
-       bool
-       select SUPPORT_SPL
-       select CPU_V7A
-       select PANIC_HANG
+       bool "SC58x series"
        select COMMON_CLK_ADI_SC58X
-       select TIMER
-       select ADI_SC5XX_TIMER
+       select CPU_V7A
 
 config SC59X
-       bool
-       select SUPPORT_SPL
-       select CPU_V7A
-       select PANIC_HANG
+       bool "SC59x 32-bit series"
        select COMMON_CLK_ADI_SC594
-       select TIMER
-       select ADI_SC5XX_TIMER
+       select CPU_V7A
        select NOP_PHY
 
 config SC59X_64
-       bool
-       select SUPPORT_SPL
-       select PANIC_HANG
-       select MMC_SDHCI_ADMA_FORCE_32BIT
+       bool "SC59x 64-bit series"
        select ARM64
-       select DM
-       select DM_SERIAL
        select COMMON_CLK_ADI_SC598
        select GICV3
        select GIC_600_CLEAR_RDPD
+       select MMC_SDHCI_ADMA_FORCE_32BIT
        select NOP_PHY
 
+endchoice
+
 config SC_BOOT_MODE
        int "SC5XX boot mode select"
        default 1