Merge branch '2019-05-28-master-imports'

[oweals/u-boot.git] / arch / arm / mach-uniphier / Kconfig

diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index cd9ba6ba9e6def4370916448fbf43f4dd9b76c04..bfb445a60296e070df0aa1a8fd606db94d57ddce 100644 (file)
--- a/arch/arm/mach-uniphier/Kconfig
+++ b/arch/arm/mach-uniphier/Kconfig
@@ -5,50 +5,28 @@ config SYS_CONFIG_NAME
 
 config ARCH_UNIPHIER_32BIT
        bool
-       select CPU_V7
-       select CPU_V7_HAS_NONSEC
-       select ARMV7_NONSEC
        select ARCH_SUPPORT_PSCI
-
-config ARCH_UNIPHIER_64BIT
-       bool
-       select ARM64
-       select SPL_SEPARATE_BSS if SPL
-       select ARMV8_MULTIENTRY if SPL
-       select ARMV8_SPIN_TABLE if SPL
+       select ARMV7_NONSEC
+       select CPU_V7A
+       select CPU_V7_HAS_NONSEC
 
 choice
         prompt "UniPhier SoC select"
-        default ARCH_UNIPHIER_PRO4
-
-config ARCH_UNIPHIER_SLD3
-       bool "UniPhier sLD3 SoC"
-       select ARCH_UNIPHIER_32BIT
+        default ARCH_UNIPHIER_V7_MULTI
 
 config ARCH_UNIPHIER_LD4_SLD8
        bool "UniPhier LD4/sLD8 SoCs"
        select ARCH_UNIPHIER_32BIT
 
-config ARCH_UNIPHIER_PRO4
-       bool "UniPhier Pro4 SoC"
-       select ARCH_UNIPHIER_32BIT
-
-config ARCH_UNIPHIER_PRO5_PXS2_LD6B
-       bool "UniPhier Pro5/PXs2/LD6b SoCs"
+config ARCH_UNIPHIER_V7_MULTI
+       bool "UniPhier Pro4/Pro5/PXs2/LD6b SoCs"
        select ARCH_UNIPHIER_32BIT
 
-config ARCH_UNIPHIER_LD11_SINGLE
-       bool "UniPhier LD11 SoC"
-       select ARCH_UNIPHIER_64BIT
-
-config ARCH_UNIPHIER_LD20_SINGLE
-       bool "UniPhier LD20 SoC"
-       select ARCH_UNIPHIER_64BIT
-
 config ARCH_UNIPHIER_V8_MULTI
        bool "UniPhier V8 SoCs"
        depends on !SPL
-       select ARCH_UNIPHIER_64BIT
+       select ARM64
+       select CMD_UNZIP
 
 endchoice
 
@@ -62,31 +40,36 @@ config ARCH_UNIPHIER_SLD8
        depends on ARCH_UNIPHIER_LD4_SLD8
        default y
 
+config ARCH_UNIPHIER_PRO4
+       bool "Enable UniPhier Pro4 SoC support"
+       depends on ARCH_UNIPHIER_V7_MULTI
+       default y
+
 config ARCH_UNIPHIER_PRO5
        bool "Enable UniPhier Pro5 SoC support"
-       depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
+       depends on ARCH_UNIPHIER_V7_MULTI
        default y
 
 config ARCH_UNIPHIER_PXS2
        bool "Enable UniPhier Pxs2 SoC support"
-       depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
+       depends on ARCH_UNIPHIER_V7_MULTI
        default y
 
 config ARCH_UNIPHIER_LD6B
        bool "Enable UniPhier LD6b SoC support"
-       depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
+       depends on ARCH_UNIPHIER_V7_MULTI
        default y
 
 config ARCH_UNIPHIER_LD11
-       bool "Enable UniPhier LD11 SoC support" if ARCH_UNIPHIER_V8_MULTI
-       depends on ARCH_UNIPHIER_LD11_SINGLE || ARCH_UNIPHIER_V8_MULTI
+       bool "Enable UniPhier LD11 SoC support"
+       depends on ARCH_UNIPHIER_V8_MULTI
        default y
 
 config ARCH_UNIPHIER_LD20
-       bool "Enable UniPhier LD20 SoC support" if ARCH_UNIPHIER_V8_MULTI
-       depends on ARCH_UNIPHIER_LD20_SINGLE || ARCH_UNIPHIER_V8_MULTI
-       select OF_BOARD_SETUP
+       bool "Enable UniPhier LD20 SoC support"
+       depends on ARCH_UNIPHIER_V8_MULTI
        default y
+       select OF_BOARD_SETUP
 
 config ARCH_UNIPHIER_PXS3
        bool "Enable UniPhier PXs3 SoC support"
@@ -96,8 +79,8 @@ config ARCH_UNIPHIER_PXS3
 config CACHE_UNIPHIER
        bool "Enable the UniPhier L2 cache controller"
        depends on ARCH_UNIPHIER_32BIT
-       select SYS_CACHE_SHIFT_7
        default y
+       select SYS_CACHE_SHIFT_7
        help
          This option allows to use the UniPhier System Cache as L2 cache.
 
@@ -134,4 +117,6 @@ config CMD_DDRMPHY_DUMP
          The command "ddrmphy" shows the resulting parameters of DDR Multi PHY
          training; it is useful for the evaluation of DDR Multi PHY training.
 
+config SYS_SOC
+       default "uniphier-v7" if ARCH_UNIPHIER_LD4_SLD8 || ARCH_UNIPHIER_V7_MULTI
 endif