michaelh/zephyr
1
0
Fork 0
Code Releases Activity

hwinfo: Add dependency handling for HWINFO_NRF in nonsecure

Browse source 
The limitation on HWINFO_NRF depending on not nonsecure was removed in
52be3030aa.
This caused problems when TF-M was not enabled.

This happens on the thingy53_nrf5340_cpuapp_ns board since this board
is not supported by TF-M.

Introduce proper dependency handling for the soc secure functions
to make HWINFO_NRF unavailable when no secure services exist in
nonsecure.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2022-04-07 10:48:25 +02:00 • committed by Anas Nashif
commit 2dae1823ab
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
drivers/hwinfo/Kconfig
View file

@ -32,6 +32,7 @@ config HWINFO_NRF
bool "NRF device ID" bool "NRF device ID"
default y default y
depends on SOC_FAMILY_NRF depends on SOC_FAMILY_NRF
depends on NRF_SOC_SECURE_SUPPORTED
help help
Enable Nordic NRF hwinfo driver. Enable Nordic NRF hwinfo driver.

8
soc/arm/nordic_nrf/Kconfig
View file

@ -16,6 +16,14 @@ config SOC_FAMILY
source "soc/arm/nordic_nrf/Kconfig.peripherals" source "soc/arm/nordic_nrf/Kconfig.peripherals"
source "soc/arm/nordic_nrf/*/Kconfig.soc" source "soc/arm/nordic_nrf/*/Kconfig.soc"
config NRF_SOC_SECURE_SUPPORTED
def_bool !TRUSTED_EXECUTION_NONSECURE || BUILD_WITH_TFM
help
Hidden function to indicate that that the soc_secure functions are
available.
The functions are always available when not in non-secure.
For non-secure the functions must redirect to secure services exposed
by the secure firmware.
config NRF_MPU_FLASH_REGION_SIZE config NRF_MPU_FLASH_REGION_SIZE
hex hex