Skip to content

Commit 75d52bb

Browse files
tomi-fontrlubos
authored andcommitted
modules: tf-m: build Crypto partition only when CONFIG_PSA_CRYPTO=y
To align with how it works when building without TF-M. At the same time remove a `depends on` because it had no effect on the upstream Kconfig option it was redefining. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
1 parent 0de545b commit 75d52bb

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

modules/trusted-firmware-m/Kconfig.tfm.defconfig

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,6 @@ config TFM_PARTITION_PROTECTED_STORAGE
8282
select PSA_WANT_ALG_GCM if SOC_NRF5340_CPUAPP
8383
select PSA_WANT_ALG_GCM if SOC_SERIES_NRF54L || SOC_SERIES_NRF71
8484

85-
# Override TF-M crypto dependency on ITS when using KMU
86-
config TFM_PARTITION_CRYPTO
87-
bool
88-
depends on TFM_PARTITION_INTERNAL_TRUSTED_STORAGE || CRACEN_KMU
89-
9085
configdefault TFM_INSTALL_TF_PSA_CRYPTO_HEADERS
9186
default n
9287

modules/trusted-firmware-m/Kconfig.tfm_minimal.defconfig

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ config TFM_MCUBOOT_IMAGE_NUMBER
88
int
99
default 1
1010

11+
config TFM_PARTITION_CRYPTO
12+
bool
13+
depends on PSA_CRYPTO_PROVIDER_TFM
14+
default y
15+
16+
if TFM_PARTITION_CRYPTO
17+
1118
config TFM_CRYPTO_RNG_MODULE_ENABLED
1219
bool
1320
default y
@@ -17,9 +24,7 @@ config TFM_CRYPTO_HASH_MODULE_ENABLED
1724
depends on PSA_HAS_HASH_SUPPORT
1825
default y
1926

20-
config TFM_PARTITION_CRYPTO
21-
bool
22-
default y
27+
endif # TFM_PARTITION_CRYPTO
2328

2429
config TFM_PARTITION_PLATFORM
2530
bool

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ manifest:
6565
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
6666
- name: zephyr
6767
repo-path: sdk-zephyr
68-
revision: 389e70196936e7634d1a954e9de9652cb4363838
68+
revision: e3ed6b35ca605705a8a53e9e975c7be5b565975e
6969
import:
7070
# In addition to the zephyr repository itself, NCS also
7171
# imports the contents of zephyr/west.yml at the above

0 commit comments

Comments
 (0)