leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Hans de Goede 2014-11-14 09:34:30 +01:00 committed by Albert ARIBAUD
parent 1bf0979f5f
commit ea624e1951
7 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/Kconfig
View File

@ -413,6 +413,8 @@ config TARGET_INTEGRATORCP_CM946ES
config TARGET_VEXPRESS_CA15_TC2 config TARGET_VEXPRESS_CA15_TC2
bool "Support vexpress_ca15_tc2" bool "Support vexpress_ca15_tc2"
select CPU_V7 select CPU_V7
select CPU_V7_HAS_NONSEC
select CPU_V7_HAS_VIRT
config TARGET_VEXPRESS_CA5X2 config TARGET_VEXPRESS_CA5X2
bool "Support 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/zynq/Kconfig"
source "arch/arm/cpu/armv7/Kconfig"
source "board/aristainetos/Kconfig" source "board/aristainetos/Kconfig"
source "board/BuR/kwb/Kconfig" source "board/BuR/kwb/Kconfig"
source "board/BuR/tseries/Kconfig" source "board/BuR/tseries/Kconfig"

23
arch/arm/cpu/armv7/Kconfig Normal file
View File

@ -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

2
arch/arm/cpu/armv7/exynos/Kconfig
View File

@ -26,6 +26,8 @@ config TARGET_ODROID
config TARGET_ARNDALE config TARGET_ARNDALE
bool "Exynos5250 Arndale board" bool "Exynos5250 Arndale board"
select CPU_V7_HAS_NONSEC
select CPU_V7_HAS_VIRT
select SUPPORT_SPL select SUPPORT_SPL
select OF_CONTROL if !SPL_BUILD select OF_CONTROL if !SPL_BUILD

2
board/sunxi/Kconfig
View File

@ -21,6 +21,8 @@ config MACH_SUN6I
config MACH_SUN7I config MACH_SUN7I
bool "sun7i (Allwinner A20)" bool "sun7i (Allwinner A20)"
select CPU_V7 select CPU_V7
select CPU_V7_HAS_NONSEC
select CPU_V7_HAS_VIRT
select SUPPORT_SPL select SUPPORT_SPL
config MACH_SUN8I config MACH_SUN8I

2
include/configs/arndale.h
View File

@ -60,6 +60,4 @@
/* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */ /* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */
#define CONFIG_ARM_GIC_BASE_ADDRESS 0x10480000 #define CONFIG_ARM_GIC_BASE_ADDRESS 0x10480000
#define CONFIG_ARMV7_VIRT
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

2
include/configs/sun7i.h
View File

@ -22,8 +22,6 @@
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#endif #endif
#define CONFIG_ARMV7_VIRT 1
#define CONFIG_ARMV7_NONSEC 1
#define CONFIG_ARMV7_PSCI 1 #define CONFIG_ARMV7_PSCI 1
#define CONFIG_ARMV7_PSCI_NR_CPUS 2 #define CONFIG_ARMV7_PSCI_NR_CPUS 2
#define CONFIG_ARMV7_SECURE_BASE SUNXI_SRAM_B_BASE #define CONFIG_ARMV7_SECURE_BASE SUNXI_SRAM_B_BASE

2
include/configs/vexpress_ca15_tc2.h
View File

@ -18,6 +18,4 @@
#define CONFIG_SYSFLAGS_ADDR 0x1c010030 #define CONFIG_SYSFLAGS_ADDR 0x1c010030
#define CONFIG_SMP_PEN_ADDR CONFIG_SYSFLAGS_ADDR #define CONFIG_SMP_PEN_ADDR CONFIG_SYSFLAGS_ADDR
#define CONFIG_ARMV7_VIRT
#endif #endif