X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=arch%2Farm%2Fmach-uniphier%2FKconfig;h=4724af58a141b87fc765e981260e6b739c792861;hb=9ecb0c416c68d3105bc9b6607bc8601cab2ecf35;hp=03256be40302ef950509aa008c95325aff05ed6c;hpb=077678eb0c226e52a1f90edabd3369ab26065b32;p=oweals%2Fu-boot.git

diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index 03256be403..4724af58a1 100644
--- a/arch/arm/mach-uniphier/Kconfig
+++ b/arch/arm/mach-uniphier/Kconfig
@@ -3,54 +3,52 @@ if ARCH_UNIPHIER
 config SYS_CONFIG_NAME
 	default "uniphier"
 
-config ARCH_UNIPHIER_PH1_SLD3
+choice
+        prompt "UniPhier SoC select"
+        default ARCH_UNIPHIER_PRO4
+
+config ARCH_UNIPHIER_SLD3
 	bool "UniPhier PH1-sLD3 SoC"
-	help
-	  This enables support for UniPhier PH1-sLD3 SoC.
+	select CPU_V7
 
-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"
+	select CPU_V7
 
-config ARCH_UNIPHIER_PH1_PRO4
+config ARCH_UNIPHIER_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.
+	select CPU_V7
 
-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.
+config ARCH_UNIPHIER_PRO5_PXS2_LD6B
+	bool "UniPhier PH1-Pro5/ProXstream2/PH1-LD6b SoC"
+	select CPU_V7
 
-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.
+endchoice
 
-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.
+config ARCH_UNIPHIER_LD4
+	bool "Enable UniPhier PH1-LD4 SoC support"
+	depends on ARCH_UNIPHIER_LD4_SLD8
+	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.
+config ARCH_UNIPHIER_SLD8
+	bool "Enable UniPhier PH1-sLD8 SoC support"
+	depends on ARCH_UNIPHIER_LD4_SLD8
+	default y
+
+config ARCH_UNIPHIER_PRO5
+	bool "Enable UniPhier PH1-Pro5 SoC support"
+	depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
+	default y
+
+config ARCH_UNIPHIER_PXS2
+	bool "Enable UniPhier ProXstream2 SoC support"
+	depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
+	default y
+
+config ARCH_UNIPHIER_LD6B
+	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"
@@ -70,15 +68,16 @@ config CMD_PINMON
 
 config CMD_DDRPHY_DUMP
 	bool "Enable dump command of DDR PHY parameters"
-	depends on ARCH_UNIPHIER_PH1_LD4 || ARCH_UNIPHIER_PH1_PRO4 || \
-		   ARCH_UNIPHIER_PH1_SLD8
+	depends on ARCH_UNIPHIER_LD4 || ARCH_UNIPHIER_PRO4 || ARCH_UNIPHIER_SLD8
+	default y
 	help
 	  The command "ddrphy" shows the resulting parameters of DDR PHY
 	  training; it is useful for the evaluation of DDR PHY training.
 
 config CMD_DDRMPHY_DUMP
 	bool "Enable dump command of DDR Multi PHY parameters"
-	depends on ARCH_UNIPHIER_PROXSTREAM2 || ARCH_UNIPHIER_PH1_LD6B
+	depends on ARCH_UNIPHIER_PXS2 || ARCH_UNIPHIER_LD6B
+	default y
 	help
 	  The command "ddrmphy" shows the resulting parameters of DDR Multi PHY
 	  training; it is useful for the evaluation of DDR Multi PHY training.