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

[u-boot] / arch / arm / cpu / armv7 / Kconfig

diff --git a/arch/arm/cpu/armv7/Kconfig b/arch/arm/cpu/armv7/Kconfig
index afeaac84dec1016b090bb6f41bca613daee8547c..b9c4f4e79b9b25c9736afab70d265422fce5904c 100644 (file)
--- a/arch/arm/cpu/armv7/Kconfig
+++ b/arch/arm/cpu/armv7/Kconfig
@@ -6,33 +6,52 @@ config CPU_V7_HAS_NONSEC
 config CPU_V7_HAS_VIRT
         bool
 
+config ARCH_SUPPORT_PSCI
+        bool
+
 config ARMV7_NONSEC
-       boolean "Enable support for booting in non-secure mode" if EXPERT
+       bool "Enable support for booting in non-secure mode" if EXPERT
        depends on CPU_V7_HAS_NONSEC
        default y
        ---help---
        Say Y here to enable support for booting in non-secure / SVC mode.
 
 config ARMV7_BOOT_SEC_DEFAULT
-       boolean "Boot in secure mode by default" if EXPERT
+       bool "Boot in secure mode by default" if EXPERT
        depends on ARMV7_NONSEC
        default y if TEGRA
        ---help---
        Say Y here to boot in secure mode by default even if non-secure mode
        is supported. This option is useful to boot kernels which do not
        suppport booting in non-secure mode. Only set this if you need it.
-       This can be overriden at run-time by setting the bootm_boot_mode env.
+       This can be overridden at run-time by setting the bootm_boot_mode env.
        variable to "sec" or "nonsec".
 
 config ARMV7_VIRT
-       boolean "Enable support for hardware virtualization" if EXPERT
+       bool "Enable support for hardware virtualization" if EXPERT
        depends on CPU_V7_HAS_VIRT && ARMV7_NONSEC
        default y
        ---help---
        Say Y here to boot in hypervisor (HYP) mode when booting non-secure.
 
+config ARMV7_PSCI
+       bool "Enable PSCI support" if EXPERT
+       depends on ARMV7_NONSEC && ARCH_SUPPORT_PSCI
+       default y
+       help
+         Say Y here to enable PSCI support.
+
+config ARMV7_PSCI_NR_CPUS
+       int "Maximum supported CPUs for PSCI"
+       depends on ARMV7_NONSEC
+       default 4
+       help
+         The maximum number of CPUs supported in the PSCI firmware.
+         It is no problem to set a larger value than the number of
+         CPUs in the actual hardware implementation.
+
 config ARMV7_LPAE
-       boolean "Use LPAE page table format" if EXPERT
+       bool "Use LPAE page table format" if EXPERT
        depends on CPU_V7
        default n
        ---help---