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

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

diff --git a/arch/arm/cpu/armv7/Kconfig b/arch/arm/cpu/armv7/Kconfig
index 61e7c824594b691db486ca60ed98c2fb1252bf3a..afeaac84dec1016b090bb6f41bca613daee8547c 100644 (file)
--- a/arch/arm/cpu/armv7/Kconfig
+++ b/arch/arm/cpu/armv7/Kconfig
@@ -16,7 +16,7 @@ config ARMV7_NONSEC
 config ARMV7_BOOT_SEC_DEFAULT
        boolean "Boot in secure mode by default" if EXPERT
        depends on ARMV7_NONSEC
-       default n
+       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
@@ -31,4 +31,12 @@ config ARMV7_VIRT
        ---help---
        Say Y here to boot in hypervisor (HYP) mode when booting non-secure.
 
+config ARMV7_LPAE
+       boolean "Use LPAE page table format" if EXPERT
+       depends on CPU_V7
+       default n
+       ---help---
+       Say Y here to use the long descriptor page table format. This is
+       required if U-Boot runs in HYP mode.
+
 endif