Commit 2dae1823 authored by Joakim Andersson's avatar Joakim Andersson Committed by Anas Nashif
Browse files

hwinfo: Add dependency handling for HWINFO_NRF in nonsecure



The limitation on HWINFO_NRF depending on not nonsecure was removed in
52be3030.
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: default avatarJoakim Andersson <joakim.andersson@nordicsemi.no>
parent 91015d1a
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ config HWINFO_NRF
	bool "NRF device ID"
	default y
	depends on SOC_FAMILY_NRF
	depends on NRF_SOC_SECURE_SUPPORTED
	help
	  Enable Nordic NRF hwinfo driver.

+8 −0
Original line number Diff line number Diff line
@@ -16,6 +16,14 @@ config SOC_FAMILY
source "soc/arm/nordic_nrf/Kconfig.peripherals"
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
	hex