Merge git://git.denx.de/u-boot-socfpga

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

diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index e256eeb..1aed55a 100644 (file)
--- a/arch/arm/mach-uniphier/Kconfig
+++ b/arch/arm/mach-uniphier/Kconfig
@@ -6,69 +6,87 @@ config SYS_CONFIG_NAME
 config ARCH_UNIPHIER_32BIT
        bool
        select CPU_V7
-
-config ARCH_UNIPHIER_64BIT
-       bool
-       select ARM64
-       select SPL_SEPARATE_BSS
-       select ARMV8_MULTIENTRY
+       select CPU_V7_HAS_NONSEC
+       select ARMV7_NONSEC
+       select ARCH_SUPPORT_PSCI
 
 choice
         prompt "UniPhier SoC select"
         default ARCH_UNIPHIER_PRO4
 
 config ARCH_UNIPHIER_SLD3
-       bool "UniPhier PH1-sLD3 SoC"
+       bool "UniPhier sLD3 SoC"
        select ARCH_UNIPHIER_32BIT
 
 config ARCH_UNIPHIER_LD4_SLD8
-       bool "UniPhier PH1-LD4/PH1-sLD8 SoC"
+       bool "UniPhier LD4/sLD8 SoCs"
        select ARCH_UNIPHIER_32BIT
 
 config ARCH_UNIPHIER_PRO4
-       bool "UniPhier PH1-Pro4 SoC"
+       bool "UniPhier Pro4 SoC"
        select ARCH_UNIPHIER_32BIT
 
 config ARCH_UNIPHIER_PRO5_PXS2_LD6B
-       bool "UniPhier PH1-Pro5/ProXstream2/PH1-LD6b SoC"
+       bool "UniPhier Pro5/PXs2/LD6b SoCs"
        select ARCH_UNIPHIER_32BIT
 
-config ARCH_UNIPHIER_LD11
-       bool "UniPhier PH1-LD11 SoC"
-       select ARCH_UNIPHIER_64BIT
-
-config ARCH_UNIPHIER_LD20
-       bool "UniPhier PH1-LD20 SoC"
-       select ARCH_UNIPHIER_64BIT
-       select OF_BOARD_SETUP
+config ARCH_UNIPHIER_V8_MULTI
+       bool "UniPhier V8 SoCs"
+       depends on !SPL
+       select ARM64
+       select CMD_UNZIP
 
 endchoice
 
 config ARCH_UNIPHIER_LD4
-       bool "Enable UniPhier PH1-LD4 SoC support"
+       bool "Enable UniPhier LD4 SoC support"
        depends on ARCH_UNIPHIER_LD4_SLD8
        default y
 
 config ARCH_UNIPHIER_SLD8
-       bool "Enable UniPhier PH1-sLD8 SoC support"
+       bool "Enable UniPhier sLD8 SoC support"
        depends on ARCH_UNIPHIER_LD4_SLD8
        default y
 
 config ARCH_UNIPHIER_PRO5
-       bool "Enable UniPhier PH1-Pro5 SoC support"
+       bool "Enable UniPhier Pro5 SoC support"
        depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
        default y
 
 config ARCH_UNIPHIER_PXS2
-       bool "Enable UniPhier ProXstream2 SoC support"
+       bool "Enable UniPhier Pxs2 SoC support"
        depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
        default y
 
 config ARCH_UNIPHIER_LD6B
-       bool "Enable UniPhier PH1-LD6b SoC support"
+       bool "Enable UniPhier LD6b SoC support"
        depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
        default y
 
+config ARCH_UNIPHIER_LD11
+       bool "Enable UniPhier LD11 SoC support"
+       depends on ARCH_UNIPHIER_V8_MULTI
+       default y
+
+config ARCH_UNIPHIER_LD20
+       bool "Enable UniPhier LD20 SoC support"
+       depends on ARCH_UNIPHIER_V8_MULTI
+       select OF_BOARD_SETUP
+       default y
+
+config ARCH_UNIPHIER_PXS3
+       bool "Enable UniPhier PXs3 SoC support"
+       depends on ARCH_UNIPHIER_V8_MULTI
+       default y
+
+config CACHE_UNIPHIER
+       bool "Enable the UniPhier L2 cache controller"
+       depends on ARCH_UNIPHIER_32BIT
+       select SYS_CACHE_SHIFT_7
+       default y
+       help
+         This option allows to use the UniPhier System Cache as L2 cache.
+
 config MICRO_SUPPORT_CARD
        bool "Use Micro Support Card"
        help
@@ -87,7 +105,8 @@ config CMD_PINMON
 
 config CMD_DDRPHY_DUMP
        bool "Enable dump command of DDR PHY parameters"
-       depends on ARCH_UNIPHIER_LD4 || ARCH_UNIPHIER_PRO4 || ARCH_UNIPHIER_SLD8
+       depends on ARCH_UNIPHIER_LD4 || ARCH_UNIPHIER_PRO4 || \
+               ARCH_UNIPHIER_SLD8 || ARCH_UNIPHIER_LD11
        default y
        help
          The command "ddrphy" shows the resulting parameters of DDR PHY