ARM: uniphier: rework UniPhier SoC select in Kconfig

The chains of "depends on <SoC_name>" in the current Kconfig is
clumsy.  The idea here is to allow users to choose a SoC group first
(SoC group consists of some SoCs that can coexist in one binary).
Then, allow to enable/disable each SoC support in the selected SoC
group.  This makes the Kconfig menu clearer.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index 03256be40302ef950509aa008c95325aff05ed6c..e859ca3adad0ea9befe9cc9771f037321d6af3a7 100644 (file)
--- a/arch/arm/mach-uniphier/Kconfig
+++ b/arch/arm/mach-uniphier/Kconfig
@@ -3,54 +3,48 @@ if ARCH_UNIPHIER
 config SYS_CONFIG_NAME
        default "uniphier"
 
+choice
+        prompt "UniPhier SoC select"
+        default ARCH_UNIPHIER_PH1_PRO4
+
 config ARCH_UNIPHIER_PH1_SLD3
        bool "UniPhier PH1-sLD3 SoC"
-       help
-         This enables support for UniPhier PH1-sLD3 SoC.
 
-config ARCH_UNIPHIER_PH1_LD4
-       bool "UniPhier PH1-LD4 SoC"
-       depends on !ARCH_UNIPHIER_PH1_SLD3
-       help
-         This enables support for UniPhier PH1-LD4 SoC.
+config ARCH_UNIPHIER_LD4_SLD8
+       bool "UniPhier PH1-LD4/PH1-sLD8 SoC"
 
 config ARCH_UNIPHIER_PH1_PRO4
        bool "UniPhier PH1-Pro4 SoC"
-       depends on !ARCH_UNIPHIER_PH1_SLD3 && \
-                  !ARCH_UNIPHIER_PH1_LD4 && \
-                  !ARCH_UNIPHIER_PH1_SLD8
-       help
-         This enables support for UniPhier PH1-Pro4 SoC.
+
+config ARCH_UNIPHIER_PRO5_PXS2_LD6B
+       bool "UniPhier PH1-Pro5/ProXstream2/PH1-LD6b SoC"
+
+endchoice
+
+config ARCH_UNIPHIER_PH1_LD4
+       bool "Enable UniPhier PH1-LD4 SoC support"
+       depends on ARCH_UNIPHIER_LD4_SLD8
+       default y
 
 config ARCH_UNIPHIER_PH1_SLD8
-       bool "UniPhier PH1-sLD8 SoC"
-       depends on !ARCH_UNIPHIER_PH1_SLD3
-       help
-         This enables support for UniPhier PH1-sLD8 SoC.
+       bool "Enable UniPhier PH1-sLD8 SoC support"
+       depends on ARCH_UNIPHIER_LD4_SLD8
+       default y
 
 config ARCH_UNIPHIER_PH1_PRO5
-       bool "UniPhier PH1-Pro5 SoC"
-       depends on !ARCH_UNIPHIER_PH1_SLD3 && \
-                  !ARCH_UNIPHIER_PH1_LD4 && \
-                  !ARCH_UNIPHIER_PH1_SLD8
-       help
-         This enables support for UniPhier PH1-Pro5 SoC.
+       bool "Enable UniPhier PH1-Pro5 SoC support"
+       depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
+       default y
 
 config ARCH_UNIPHIER_PROXSTREAM2
-       bool "UniPhier ProXstream2 SoC"
-       depends on !ARCH_UNIPHIER_PH1_SLD3 && \
-                  !ARCH_UNIPHIER_PH1_LD4 && \
-                  !ARCH_UNIPHIER_PH1_SLD8
-       help
-         This enables support for UniPhier ProXstream2 SoC.
+       bool "Enable UniPhier ProXstream2 SoC support"
+       depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
+       default y
 
 config ARCH_UNIPHIER_PH1_LD6B
-       bool "UniPhier PH1-LD6b SoC"
-       depends on !ARCH_UNIPHIER_PH1_SLD3 && \
-                  !ARCH_UNIPHIER_PH1_LD4 && \
-                  !ARCH_UNIPHIER_PH1_SLD8
-       help
-         This enables support for UniPhier PH1-LD6b SoC.
+       bool "Enable UniPhier PH1-LD6b SoC support"
+       depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
+       default y
 
 config MICRO_SUPPORT_CARD
        bool "Use Micro Support Card"

diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig
index 892bccc32f60253df5a3d34d977dd2e9fb470e3d..4d7afb82c78b58662add447a41a0e23185d0fdd3 100644 (file)
--- a/configs/uniphier_ld4_sld8_defconfig
+++ b/configs/uniphier_ld4_sld8_defconfig
@@ -1,8 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_UNIPHIER=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_ARCH_UNIPHIER_PH1_LD4=y
-CONFIG_ARCH_UNIPHIER_PH1_SLD8=y
+CONFIG_ARCH_UNIPHIER_LD4_SLD8=y
 CONFIG_MICRO_SUPPORT_CARD=y
 CONFIG_SYS_TEXT_BASE=0x84000000
 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-ld4-ref"

diff --git a/configs/uniphier_pxs2_ld6b_defconfig b/configs/uniphier_pxs2_ld6b_defconfig
index 10af9c884b8ca28ac93f59e20da2d605c6746621..4a8d70b801f494c5a696f184ef1e8da4f12c8988 100644 (file)
--- a/configs/uniphier_pxs2_ld6b_defconfig
+++ b/configs/uniphier_pxs2_ld6b_defconfig
@@ -1,9 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_UNIPHIER=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_ARCH_UNIPHIER_PH1_PRO5=y
-CONFIG_ARCH_UNIPHIER_PROXSTREAM2=y
-CONFIG_ARCH_UNIPHIER_PH1_LD6B=y
+CONFIG_ARCH_UNIPHIER_PRO5_PXS2_LD6B=y
 CONFIG_MICRO_SUPPORT_CARD=y
 CONFIG_SYS_TEXT_BASE=0x84000000
 CONFIG_DEFAULT_DEVICE_TREE="uniphier-proxstream2-vodka"