From: Oliver Gaskell Oliver.Gaskell@analog.com
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 --- arch/arm/Kconfig | 8 ++++++++ arch/arm/mach-sc5xx/Kconfig | 39 +++++++++++++++------------------------ 2 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ba0359fed5..72960126ee 100644 --- 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 3846b4fd5b..2ec09dbf3e 100644 --- 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