From 08fa7a0c6b6504dfc639845b0ac2a0e9910e31d0 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 12 Mar 2016 10:53:22 -0600 Subject: [PATCH] Rename CONFIG_SAMA5_HAVE_TRUSTZONE to CONFIG_ARCH_HAVE_TRUSTZONE; Eliminate CONFIG_SAMA5_SECURE; Add CONFIG_ARCH_TRUSTZONE_SECURE --- arch/arm/Kconfig | 28 ++++++++++++++++++++++++++++ arch/arm/src/sama5/Kconfig | 15 ++------------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b16dae7b3d..873cd93071 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -510,9 +510,37 @@ config ARCH_DPFPU Enable toolchain support for double precision (64-bit) floating point if both the toolchain and the hardware support it. +config ARCH_HAVE_TRUSTZONE + bool + default n + ---help--- + Automatically selected to indicate that the ARM CPU supports + TrustZone. + +choice + prompt "TrustZone Configuration" + default ARCH_TRUSTZONE_SECURE + depends on ARCH_HAVE_TRUSTZONE + +config ARCH_TRUSTZONE_SECURE + bool "All CPUs operate secure state" + +config ARCH_TRUSTZONE_NONSECURE + bool "All CPUs operate non-secure state" + depends on EXPERIMENTAL + +config ARCH_TRUSTZONE_BOTH + bool "CPUs operate in both secure and non-secure states" + depends on EXPERIMENTAL + +endchoice # TrustZone Configuration + config ARM_HAVE_MPU_UNIFIED bool default n + ---help--- + Automatically selected to indicate that the CPU supports a + unified MPU for both instruction and data addresses. config ARM_MPU bool "MPU support" diff --git a/arch/arm/src/sama5/Kconfig b/arch/arm/src/sama5/Kconfig index de781cdb9b..351a5bebe8 100644 --- a/arch/arm/src/sama5/Kconfig +++ b/arch/arm/src/sama5/Kconfig @@ -157,10 +157,6 @@ config SAMA5_HAVE_TC2 bool default n -config SAMA5_HAVE_TRUSTZONE - bool - default n - config SAMA5_HAVE_TWI3 bool default n @@ -215,7 +211,7 @@ config ARCH_CHIP_SAMA5D2 select SAMA5_HAVE_SFC select SAMA5_HAVE_SPI2 select SAMA5_HAVE_TC1 - select SAMA5_HAVE_TRUSTZONE + select ARCH_HAVE_TRUSTZONE config ARCH_CHIP_SAMA5D3 bool @@ -252,7 +248,7 @@ config ARCH_CHIP_SAMA5D4 select SAMA5_HAVE_SPI2 select SAMA5_HAVE_TC1 select SAMA5_HAVE_TC2 - select SAMA5_HAVE_TRUSTZONE + select ARCH_HAVE_TRUSTZONE select SAMA5_HAVE_TWI3 choice @@ -749,13 +745,6 @@ config SAMA5_VDEC endmenu # SAMA5 Peripheral Support -config SAMA5_SECURE - bool "Enable secure features" - default n - depends on SAMA5_HAVE_TRUSTZONE && EXPERIMENTAL - ---help--- - Does not do anything now, but may in the future - config SAMA5_PIO_IRQ bool "PIO pin interrupts" ---help---