ARM: Add arch/arm/cpu/armv7/Kconfig with non-secure and virt options

Add arch/arm/cpu/armv7/Kconfig with non-secure and virt options, this is a
preparation patch for adding an env variable to choose between secure /
non-secure boot on non-secure boot capable systems, specifically this
prepares for adding CONFIG_ARMV7_BOOT_SEC_DEFAULT as a proper Kconfig option.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3955978fbedc62af74980a3947f307d2a2d58266..329c323fabebf72230ae63e97e560a4054d573dc 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -413,6 +413,8 @@ config TARGET_INTEGRATORCP_CM946ES
 config TARGET_VEXPRESS_CA15_TC2
        bool "Support vexpress_ca15_tc2"
        select CPU_V7
+       select CPU_V7_HAS_NONSEC
+       select CPU_V7_HAS_VIRT
 
 config TARGET_VEXPRESS_CA5X2
        bool "Support vexpress_ca5x2"
@@ -812,6 +814,8 @@ source "arch/arm/cpu/arm926ejs/versatile/Kconfig"
 
 source "arch/arm/cpu/armv7/zynq/Kconfig"
 
+source "arch/arm/cpu/armv7/Kconfig"
+
 source "board/aristainetos/Kconfig"
 source "board/BuR/kwb/Kconfig"
 source "board/BuR/tseries/Kconfig"

diff --git a/arch/arm/cpu/armv7/Kconfig b/arch/arm/cpu/armv7/Kconfig
new file mode 100644 (file)
index 0000000..15c5155
--- /dev/null
+++ b/arch/arm/cpu/armv7/Kconfig
@@ -0,0 +1,23 @@
+if CPU_V7
+
+config CPU_V7_HAS_NONSEC
+        bool
+
+config CPU_V7_HAS_VIRT
+        bool
+
+config ARMV7_NONSEC
+       boolean "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_VIRT
+       boolean "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.
+
+endif

diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/cpu/armv7/exynos/Kconfig
index 090be9383fc03cf3857d24b860678d01e9103034..e9a102ce3c05681394c2043f0235f6e97baee653 100644 (file)
--- a/arch/arm/cpu/armv7/exynos/Kconfig
+++ b/arch/arm/cpu/armv7/exynos/Kconfig
@@ -26,6 +26,8 @@ config TARGET_ODROID
 
 config TARGET_ARNDALE
        bool "Exynos5250 Arndale board"
+       select CPU_V7_HAS_NONSEC
+       select CPU_V7_HAS_VIRT
        select SUPPORT_SPL
        select OF_CONTROL if !SPL_BUILD
 

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index c3f865d2983e89fb8ecc2e25ff6ab1469d8c7a53..7555896f740885343dd9f1f49f314635d3b34198 100644 (file)
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -21,6 +21,8 @@ config MACH_SUN6I
 config MACH_SUN7I
        bool "sun7i (Allwinner A20)"
        select CPU_V7
+       select CPU_V7_HAS_NONSEC
+       select CPU_V7_HAS_VIRT
        select SUPPORT_SPL
 
 config MACH_SUN8I

diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index f9ee40fa7eef1605c39647eabf55ce4d3afd37d8..aa6b631c5d469cbe575ad2b800c1bff67f496be9 100644 (file)
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -60,6 +60,4 @@
 /* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */
 #define CONFIG_ARM_GIC_BASE_ADDRESS    0x10480000
 
-#define CONFIG_ARMV7_VIRT
-
 #endif /* __CONFIG_H */

diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h
index ea407903229adcfcaddb34b67313f7f7f80a5f7d..36295876fd87fe6367afe20b1cb38befdb99da8d 100644 (file)
--- a/include/configs/sun7i.h
+++ b/include/configs/sun7i.h
@@ -22,8 +22,6 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #endif
 
-#define CONFIG_ARMV7_VIRT              1
-#define CONFIG_ARMV7_NONSEC            1
 #define CONFIG_ARMV7_PSCI              1
 #define CONFIG_ARMV7_PSCI_NR_CPUS      2
 #define CONFIG_ARMV7_SECURE_BASE       SUNXI_SRAM_B_BASE

diff --git a/include/configs/vexpress_ca15_tc2.h b/include/configs/vexpress_ca15_tc2.h
index 982f4a75ef6775e99f08c16ed6515501d490fbab..b43afa29387df23fa5bccc37d734e83b2600406a 100644 (file)
--- a/include/configs/vexpress_ca15_tc2.h
+++ b/include/configs/vexpress_ca15_tc2.h
@@ -18,6 +18,4 @@
 #define CONFIG_SYSFLAGS_ADDR   0x1c010030
 #define CONFIG_SMP_PEN_ADDR    CONFIG_SYSFLAGS_ADDR
 
-#define CONFIG_ARMV7_VIRT
-
 #endif