Skip to content

Commit 86320e0

Browse files
maje-embnordicjm
maje-emb
authored and
nordicjm
committed
samples: bluetooth: Enable ZMS for nRF54H20 platform
Enabled the ZMS file system for the nRF54H20 DK in the Bluetooth samples. Ref: NCSDK-30669 Signed-off-by: Marcin Jelinski <[email protected]>
1 parent ff23970 commit 86320e0

File tree

16 files changed

+45
-31
lines changed

16 files changed

+45
-31
lines changed

‎doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,21 @@ Bluetooth samples
309309
* :ref:`bluetooth_central_hids`
310310
* :ref:`peripheral_hids_keyboard`
311311
* :ref:`peripheral_hids_mouse`
312+
* :ref:`central_and_peripheral_hrs`
313+
* :ref:`central_bas`
314+
* :ref:`central_nfc_pairing`
315+
* :ref:`central_uart`
316+
* :ref:`peripheral_bms`
317+
* :ref:`peripheral_cgms`
318+
* :ref:`peripheral_cts_client`
319+
* :ref:`peripheral_lbs`
320+
* :ref:`peripheral_mds`
321+
* :ref:`peripheral_nfc_pairing`
322+
* :ref:`power_profiling`
323+
* :ref:`peripheral_rscs`
324+
* :ref:`peripheral_status`
325+
* :ref:`peripheral_uart`
326+
* :ref:`ble_rpc_host`
312327

313328
As a result, all :ref:`zephyr:nrf54h20dk_nrf54h20` configurations of the affected samples were migrated from the NVS settings backend to the ZMS settings backend.
314329
* Testing steps in the :ref:`peripheral_hids_mouse` to provide the build configuration that is compatible with the `Bluetooth Low Energy app`_ testing tool.

‎samples/bluetooth/central_and_peripheral_hr/Kconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
source "Kconfig.zephyr"
88

99
config ZMS
10-
default y if SOC_FLASH_NRF_RRAM
10+
default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
1111

1212
config NVS
13-
default y if !SOC_FLASH_NRF_RRAM
13+
default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

‎samples/bluetooth/central_bas/Kconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ config SETTINGS
1010
default y
1111

1212
config ZMS
13-
default y if SOC_FLASH_NRF_RRAM
13+
default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
1414

1515
config NVS
16-
default y if !SOC_FLASH_NRF_RRAM
16+
default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

‎samples/bluetooth/central_nfc_pairing/Kconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ config SETTINGS
1010
default y
1111

1212
config ZMS
13-
default y if SOC_FLASH_NRF_RRAM
13+
default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
1414

1515
config NVS
16-
default y if !SOC_FLASH_NRF_RRAM
16+
default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

‎samples/bluetooth/central_uart/Kconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ config SETTINGS
1010
default y
1111

1212
config ZMS
13-
default y if SOC_FLASH_NRF_RRAM
13+
default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
1414

1515
config NVS
16-
default y if !SOC_FLASH_NRF_RRAM
16+
default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

‎samples/bluetooth/peripheral_bms/Kconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ config SETTINGS
1010
default y
1111

1212
config ZMS
13-
default y if SOC_FLASH_NRF_RRAM
13+
default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
1414

1515
config NVS
16-
default y if !SOC_FLASH_NRF_RRAM
16+
default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

‎samples/bluetooth/peripheral_cgms/Kconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ config SETTINGS
1010
default y
1111

1212
config ZMS
13-
default y if SOC_FLASH_NRF_RRAM
13+
default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
1414

1515
config NVS
16-
default y if !SOC_FLASH_NRF_RRAM
16+
default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

‎samples/bluetooth/peripheral_cts_client/Kconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ config SETTINGS
1010
default y
1111

1212
config ZMS
13-
default y if SOC_FLASH_NRF_RRAM
13+
default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
1414

1515
config NVS
16-
default y if !SOC_FLASH_NRF_RRAM
16+
default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

‎samples/bluetooth/peripheral_lbs/Kconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ config BT_LBS_SECURITY_ENABLED
1616
select FLASH
1717
select FLASH_PAGE_LAYOUT
1818
select FLASH_MAP
19-
select ZMS if SOC_FLASH_NRF_RRAM
20-
select NVS if !SOC_FLASH_NRF_RRAM
19+
select ZMS if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
20+
select NVS if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
2121
select SETTINGS
2222
help
2323
"Enable BLE security for the LED-Button service"

‎samples/bluetooth/peripheral_mds/Kconfig‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ config SETTINGS
1010
default y
1111

1212
config ZMS
13-
default y if SOC_FLASH_NRF_RRAM
14-
13+
default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
1514
config NVS
16-
default y if !SOC_FLASH_NRF_RRAM
15+
default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

0 commit comments

Comments
 (0)