ARM: keystone2: use SPD info to configure K2HK and K2E DDR3

[u-boot] / arch / arm / mach-uniphier / Kconfig

diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index 22ab798b969c4dc1deff494a38dfdb7fd5a7b748..660f83c8557c7dfc1f35b19272c056658a8b1a2a 100644 (file)
--- a/arch/arm/mach-uniphier/Kconfig
+++ b/arch/arm/mach-uniphier/Kconfig
@@ -3,62 +3,52 @@ if ARCH_UNIPHIER
 config SYS_CONFIG_NAME
        default "uniphier"
 
-config UNIPHIER_SMP
-       bool
+choice
+        prompt "UniPhier SoC select"
+        default ARCH_UNIPHIER_PH1_PRO4
 
 config ARCH_UNIPHIER_PH1_SLD3
        bool "UniPhier PH1-sLD3 SoC"
-       select UNIPHIER_SMP
-       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
        bool "UniPhier PH1-Pro4 SoC"
-       select UNIPHIER_SMP
-       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_PRO5_PXS2_LD6B
+       bool "UniPhier PH1-Pro5/ProXstream2/PH1-LD6b SoC"
+       select CPU_V7
+
+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"
-       select UNIPHIER_SMP
-       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"
-       select UNIPHIER_SMP
-       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"
-       select UNIPHIER_SMP
-       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"
@@ -78,8 +68,17 @@ 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
        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
+       help
+         The command "ddrmphy" shows the resulting parameters of DDR Multi PHY
+         training; it is useful for the evaluation of DDR Multi PHY training.
+
 endif