Skip to content

Commit 63e45c8

Browse files
joerchancarlescufi
authored andcommitted
soc: nordic_nrf: Allow building with TF-M without platform partition
Allow building for nRF non-secure and TF-M enabled without having the platform partition enabled. In this configuration the soc_secure functions have no valid implementation, leave it as a compilation error if the application includes the functions. Add missing dependency on soc_secure functions being available for SOC_HFXO_CAP_INTERNAL configuration. Signed-off-by: Joakim Andersson <[email protected]>
1 parent c08964a commit 63e45c8

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

soc/arm/nordic_nrf/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ source "soc/arm/nordic_nrf/Kconfig.peripherals"
1717
source "soc/arm/nordic_nrf/*/Kconfig.soc"
1818

1919
config NRF_SOC_SECURE_SUPPORTED
20-
def_bool !TRUSTED_EXECUTION_NONSECURE || BUILD_WITH_TFM
20+
def_bool !TRUSTED_EXECUTION_NONSECURE || (BUILD_WITH_TFM && TFM_PARTITION_PLATFORM)
2121
help
2222
Hidden function to indicate that that the soc_secure functions are
2323
available.

soc/arm/nordic_nrf/common/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
zephyr_library_sources_ifdef(CONFIG_SOC_FAMILY_NRF soc_nrf_common.S)
55
zephyr_include_directories(.)
66

7-
if (CONFIG_BUILD_WITH_TFM)
7+
if (CONFIG_TFM_PARTITION_PLATFORM)
88
zephyr_sources(soc_secure.c)
99
zephyr_library_include_directories(
1010
$<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/install/interface/include

soc/arm/nordic_nrf/nrf53/Kconfig.soc

+1
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ config SOC_HFXO_CAP_EXTERNAL
100100

101101
config SOC_HFXO_CAP_INTERNAL
102102
bool "Use internal load capacitors"
103+
depends on NRF_SOC_SECURE_SUPPORTED
103104

104105
endchoice
105106

0 commit comments

Comments
 (0)