Merge branch 'master' of http://git.denx.de/u-boot-mmc

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

diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index e256eeb6686805131a1a5cb5aaf992df1cf6de1e..7bee6c7a299099708080756a4450bc36a291e750 100644 (file)
--- a/arch/arm/mach-uniphier/Kconfig
+++ b/arch/arm/mach-uniphier/Kconfig
@@ -6,12 +6,16 @@ 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
        select ARMV8_MULTIENTRY
+       select ARMV8_SPIN_TABLE
 
 choice
         prompt "UniPhier SoC select"
@@ -69,6 +73,14 @@ config ARCH_UNIPHIER_LD6B
        depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
        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