From: Chen-Yu Tsai <wens@csie.org>
Date: Wed, 6 Jan 2016 07:13:09 +0000 (+0800)
Subject: sunxi: Enable booting non-secure and virtualization for H3
X-Git-Tag: v2016.03-rc1~48^2~11
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=853f6d1ef8d3c4d7967651bc9009d96e129c9c05;p=u-boot

sunxi: Enable booting non-secure and virtualization for H3

Now that we support PSCI and various security switches, we can let
U-boot boot Linux into non-secure and HYP mode.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index 7c69be918f..8a30d08467 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -71,8 +71,11 @@ config MACH_SUN8I_A33
 config MACH_SUN8I_H3
 	bool "sun8i (Allwinner H3)"
 	select CPU_V7
+	select CPU_V7_HAS_NONSEC
+	select CPU_V7_HAS_VIRT
 	select SUNXI_GEN_SUN6I
 	select SUPPORT_SPL
+	select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
 
 config MACH_SUN8I_A83T
 	bool "sun8i (Allwinner A83T)"