From: Hans de Goede Date: Fri, 24 Oct 2014 18:12:04 +0000 (+0200) Subject: sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set X-Git-Tag: v2015.01-rc3~55^2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b366fb92c3d118f97bb0f01fa9c40d253e70e12c;p=oweals%2Fu-boot.git sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set Old kernels cannot handle booting in non-secure (hyp) mode, so when OLD_SUNXI_KERNEL_COMPAT is set, also set ARMV7_BOOT_SEC_DEFAULT. Note that whether to booting secure or non-secure can always be overriden using the bootm_boot_mode environment variable. Signed-off-by: Hans de Goede Acked-by: Ian Campbell --- diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index e20ea1b13f..246cd9a1a7 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -24,6 +24,7 @@ config MACH_SUN7I select CPU_V7_HAS_NONSEC select CPU_V7_HAS_VIRT select SUPPORT_SPL + select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT config MACH_SUN8I bool "sun8i (Allwinner A23)"