nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 08:38:38 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

arch: Move trustzone related setting to common place

Browse source 
to share the security setting between arm32 and arm64

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2023-07-30 22:17:58 +08:00 committed by Mateusz Szafoni
parent b183114d43
commit bd30d1a4d5
3 changed files with 23 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
arch/Kconfig
View file

@ -514,6 +514,29 @@ config ARCH_HAVE_ELF_EXECUTABLE
bool
default n
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_NONSECURE
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"
config ARCH_TRUSTZONE_BOTH
bool "CPUs operate in both secure and non-secure states"
endchoice # TrustZone Configuration
config ARCH_FPU
bool "FPU support"
default y

23
arch/arm/Kconfig
View file

@ -1034,29 +1034,6 @@ config ARCH_CHIP
default "phy62xx" if ARCH_CHIP_PHY62XX
default "tlsr82" if ARCH_CHIP_TLSR82
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_NONSECURE
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"
config ARCH_TRUSTZONE_BOTH
bool "CPUs operate in both secure and non-secure states"
endchoice # TrustZone Configuration
config ARM_THUMB
bool "Thumb Mode"
default n

7
arch/arm64/Kconfig
View file

@ -185,13 +185,6 @@ config ARCH_CHIP
default "qemu" if ARCH_CHIP_QEMU
default "fvp-v8r" if ARCH_CHIP_FVP_ARMV8R
config ARCH_HAVE_TRUSTZONE
bool
default n
---help---
Automatically selected to indicate that the ARM CPU supports
TrustZone.
config ARM_HAVE_NEON
bool
default n