diff --git a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf5340dk_nrf5340_cpuapp_ns.conf b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf5340dk_nrf5340_cpuapp_ns.conf new file mode 100644 index 000000000000..6a2fd28cfde3 --- /dev/null +++ b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf5340dk_nrf5340_cpuapp_ns.conf @@ -0,0 +1,16 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# TF-M profile has to be properly configured to be able to run +# the Bluetooth stack which uses PSA crypto API. +# The following configuration is a minimal set of options required. +CONFIG_TFM_PROFILE_TYPE_NOT_SET=y + +CONFIG_TFM_PARTITION_PLATFORM=y +CONFIG_TFM_PARTITION_CRYPTO=y +CONFIG_TFM_PARTITION_INTERNAL_TRUSTED_STORAGE=y +CONFIG_TFM_PARTITION_PROTECTED_STORAGE=n +CONFIG_TFM_PARTITION_INITIAL_ATTESTATION=n diff --git a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf5340dk_nrf5340_cpuapp_ns_release.conf b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf5340dk_nrf5340_cpuapp_ns_release.conf index dba929f0715c..cb44f9259979 100644 --- a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf5340dk_nrf5340_cpuapp_ns_release.conf +++ b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf5340dk_nrf5340_cpuapp_ns_release.conf @@ -4,5 +4,16 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # +# TF-M profile has to be properly configured to be able to run +# the Bluetooth stack which uses PSA crypto API. +# The following configuration is a minimal set of options required. +CONFIG_TFM_PROFILE_TYPE_NOT_SET=y + +CONFIG_TFM_PARTITION_PLATFORM=y +CONFIG_TFM_PARTITION_CRYPTO=y +CONFIG_TFM_PARTITION_INTERNAL_TRUSTED_STORAGE=y +CONFIG_TFM_PARTITION_PROTECTED_STORAGE=n +CONFIG_TFM_PARTITION_INITIAL_ATTESTATION=n + # Disable TF-M logging CONFIG_TFM_LOG_LEVEL_SILENCE=y diff --git a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/thingy53_nrf5340_cpuapp_ns.conf b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/thingy53_nrf5340_cpuapp_ns.conf index e49d1116cd23..831fe38be800 100644 --- a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/thingy53_nrf5340_cpuapp_ns.conf +++ b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/thingy53_nrf5340_cpuapp_ns.conf @@ -34,3 +34,14 @@ CONFIG_DULT_BATTERY_TYPE_RECHARGEABLE=y # * thingy53/nrf5340/cpuapp(/ns) CONFIG_BT_ADV_PROV_TX_POWER_CORRECTION_VAL=-12 CONFIG_BT_FAST_PAIR_FMDN_TX_POWER_CORRECTION_VAL=-12 + +# TF-M profile has to be properly configured to be able to run +# the Bluetooth stack which uses PSA crypto API. +# The following configuration is a minimal set of options required. +CONFIG_TFM_PROFILE_TYPE_NOT_SET=y + +CONFIG_TFM_PARTITION_PLATFORM=y +CONFIG_TFM_PARTITION_CRYPTO=y +CONFIG_TFM_PARTITION_INTERNAL_TRUSTED_STORAGE=y +CONFIG_TFM_PARTITION_PROTECTED_STORAGE=n +CONFIG_TFM_PARTITION_INITIAL_ATTESTATION=n diff --git a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/thingy53_nrf5340_cpuapp_ns_release.conf b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/thingy53_nrf5340_cpuapp_ns_release.conf index aa0f9bb92a55..daf78734f64c 100644 --- a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/thingy53_nrf5340_cpuapp_ns_release.conf +++ b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/thingy53_nrf5340_cpuapp_ns_release.conf @@ -29,3 +29,14 @@ CONFIG_DULT_BATTERY_TYPE_RECHARGEABLE=y # * thingy53/nrf5340/cpuapp(/ns) CONFIG_BT_ADV_PROV_TX_POWER_CORRECTION_VAL=-12 CONFIG_BT_FAST_PAIR_FMDN_TX_POWER_CORRECTION_VAL=-12 + +# TF-M profile has to be properly configured to be able to run +# the Bluetooth stack which uses PSA crypto API. +# The following configuration is a minimal set of options required. +CONFIG_TFM_PROFILE_TYPE_NOT_SET=y + +CONFIG_TFM_PARTITION_PLATFORM=y +CONFIG_TFM_PARTITION_CRYPTO=y +CONFIG_TFM_PARTITION_INTERNAL_TRUSTED_STORAGE=y +CONFIG_TFM_PARTITION_PROTECTED_STORAGE=n +CONFIG_TFM_PARTITION_INITIAL_ATTESTATION=n diff --git a/samples/bluetooth/fast_pair/locator_tag/configuration/pm_static_nrf5340dk_nrf5340_cpuapp_ns.yml b/samples/bluetooth/fast_pair/locator_tag/configuration/pm_static_nrf5340dk_nrf5340_cpuapp_ns.yml index 93e914f30a87..29bb32ba1e57 100644 --- a/samples/bluetooth/fast_pair/locator_tag/configuration/pm_static_nrf5340dk_nrf5340_cpuapp_ns.yml +++ b/samples/bluetooth/fast_pair/locator_tag/configuration/pm_static_nrf5340dk_nrf5340_cpuapp_ns.yml @@ -10,7 +10,7 @@ mcuboot_primary: - tfm - app region: flash_primary - size: 0xef000 + size: 0xe8000 span: *id001 mcuboot_pad: address: 0xc000 @@ -19,38 +19,46 @@ mcuboot_pad: tfm: address: 0xc200 region: flash_primary - size: 0xbe00 + size: 0x17e00 tfm_secure: address: 0xc000 - size: 0xc000 + size: 0x18000 span: [mcuboot_pad, tfm] tfm_nonsecure: - address: 0x18000 - size: 0xe3000 + address: 0x24000 + size: 0xd0000 span: [app] app: - address: 0x18000 + address: 0x24000 region: flash_primary - size: 0xe3000 + size: 0xd0000 mcuboot_primary_app: address: 0xc200 orig_span: &id002 - tfm - app region: flash_primary - size: 0xeee00 + size: 0xe7e00 span: *id002 +nonsecure_storage: + address: 0xf4000 + size: 0x8000 + span: [bt_fast_pair, settings_storage] bt_fast_pair: - address: 0xfb000 + address: 0xf4000 region: flash_primary size: 0x1000 +settings_storage: + address: 0xf5000 + region: flash_primary + size: 0x7000 -nonsecure_storage: +tfm_storage: address: 0xfc000 size: 0x4000 - span: [settings_storage] -settings_storage: + span: [tfm_its] +tfm_its: address: 0xfc000 region: flash_primary size: 0x4000 diff --git a/samples/bluetooth/fast_pair/locator_tag/configuration/pm_static_thingy53_nrf5340_cpuapp_ns.yml b/samples/bluetooth/fast_pair/locator_tag/configuration/pm_static_thingy53_nrf5340_cpuapp_ns.yml index 93e914f30a87..29bb32ba1e57 100644 --- a/samples/bluetooth/fast_pair/locator_tag/configuration/pm_static_thingy53_nrf5340_cpuapp_ns.yml +++ b/samples/bluetooth/fast_pair/locator_tag/configuration/pm_static_thingy53_nrf5340_cpuapp_ns.yml @@ -10,7 +10,7 @@ mcuboot_primary: - tfm - app region: flash_primary - size: 0xef000 + size: 0xe8000 span: *id001 mcuboot_pad: address: 0xc000 @@ -19,38 +19,46 @@ mcuboot_pad: tfm: address: 0xc200 region: flash_primary - size: 0xbe00 + size: 0x17e00 tfm_secure: address: 0xc000 - size: 0xc000 + size: 0x18000 span: [mcuboot_pad, tfm] tfm_nonsecure: - address: 0x18000 - size: 0xe3000 + address: 0x24000 + size: 0xd0000 span: [app] app: - address: 0x18000 + address: 0x24000 region: flash_primary - size: 0xe3000 + size: 0xd0000 mcuboot_primary_app: address: 0xc200 orig_span: &id002 - tfm - app region: flash_primary - size: 0xeee00 + size: 0xe7e00 span: *id002 +nonsecure_storage: + address: 0xf4000 + size: 0x8000 + span: [bt_fast_pair, settings_storage] bt_fast_pair: - address: 0xfb000 + address: 0xf4000 region: flash_primary size: 0x1000 +settings_storage: + address: 0xf5000 + region: flash_primary + size: 0x7000 -nonsecure_storage: +tfm_storage: address: 0xfc000 size: 0x4000 - span: [settings_storage] -settings_storage: + span: [tfm_its] +tfm_its: address: 0xfc000 region: flash_primary size: 0x4000