sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename CONFIG_SAMA5_HAVE_TRUSTZONE to CONFIG_ARCH_HAVE_TRUSTZONE; Eliminate CONFIG_SAMA5_SECURE; Add CONFIG_ARCH_TRUSTZONE_SECURE

Browse Source
This commit is contained in:
Gregory Nutt 2016-03-12 10:53:22 -06:00
parent a1ee5ae6e5
commit 08fa7a0c6b
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arch/arm/Kconfig
View File

@ -510,9 +510,37 @@ config ARCH_DPFPU
Enable toolchain support for double precision (64-bit) floating Enable toolchain support for double precision (64-bit) floating
point if both the toolchain and the hardware support it. 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 config ARM_HAVE_MPU_UNIFIED
bool bool
default n default n
---help---
Automatically selected to indicate that the CPU supports a
unified MPU for both instruction and data addresses.
config ARM_MPU config ARM_MPU
bool "MPU support" bool "MPU support"

15
arch/arm/src/sama5/Kconfig
View File

@ -157,10 +157,6 @@ config SAMA5_HAVE_TC2
bool bool
default n default n
config SAMA5_HAVE_TRUSTZONE
bool
default n
config SAMA5_HAVE_TWI3 config SAMA5_HAVE_TWI3
bool bool
default n default n
@ -215,7 +211,7 @@ config ARCH_CHIP_SAMA5D2
select SAMA5_HAVE_SFC select SAMA5_HAVE_SFC
select SAMA5_HAVE_SPI2 select SAMA5_HAVE_SPI2
select SAMA5_HAVE_TC1 select SAMA5_HAVE_TC1
select SAMA5_HAVE_TRUSTZONE select ARCH_HAVE_TRUSTZONE
config ARCH_CHIP_SAMA5D3 config ARCH_CHIP_SAMA5D3
bool bool
@ -252,7 +248,7 @@ config ARCH_CHIP_SAMA5D4
select SAMA5_HAVE_SPI2 select SAMA5_HAVE_SPI2
select SAMA5_HAVE_TC1 select SAMA5_HAVE_TC1
select SAMA5_HAVE_TC2 select SAMA5_HAVE_TC2
select SAMA5_HAVE_TRUSTZONE select ARCH_HAVE_TRUSTZONE
select SAMA5_HAVE_TWI3 select SAMA5_HAVE_TWI3
choice choice
@ -749,13 +745,6 @@ config SAMA5_VDEC
endmenu # SAMA5 Peripheral Support 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 config SAMA5_PIO_IRQ
bool "PIO pin interrupts" bool "PIO pin interrupts"
---help--- ---help---