Skip to content

Commit

Permalink
samples: bluetooth: Enable ZMS for nRF54H20 platform
Browse files Browse the repository at this point in the history 
Enabled the ZMS file system for the nRF54H20 DK in the
Bluetooth samples.

Ref: NCSDK-30669

Signed-off-by: Marcin Jelinski <[email protected]>
  • Loading branch information
@maje-emb @nordicjm
maje-emb authored and nordicjm committed Dec 3, 2024
1 parent ff23970 commit 86320e0
Show file tree
Hide file tree
Showing 16 changed files with 45 additions and 31 deletions.
15 changes: 15 additions & 0 deletions doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,21 @@ Bluetooth samples
* :ref:`bluetooth_central_hids`
* :ref:`peripheral_hids_keyboard`
* :ref:`peripheral_hids_mouse`
* :ref:`central_and_peripheral_hrs`
* :ref:`central_bas`
* :ref:`central_nfc_pairing`
* :ref:`central_uart`
* :ref:`peripheral_bms`
* :ref:`peripheral_cgms`
* :ref:`peripheral_cts_client`
* :ref:`peripheral_lbs`
* :ref:`peripheral_mds`
* :ref:`peripheral_nfc_pairing`
* :ref:`power_profiling`
* :ref:`peripheral_rscs`
* :ref:`peripheral_status`
* :ref:`peripheral_uart`
* :ref:`ble_rpc_host`

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.
* Testing steps in the :ref:`peripheral_hids_mouse` to provide the build configuration that is compatible with the `Bluetooth Low Energy app`_ testing tool.
Expand Down
4 changes: 2 additions & 2 deletions samples/bluetooth/central_and_peripheral_hr/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
source "Kconfig.zephyr"

config ZMS
default y if SOC_FLASH_NRF_RRAM
default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

config NVS
default y if !SOC_FLASH_NRF_RRAM
default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
4 changes: 2 additions & 2 deletions samples/bluetooth/central_bas/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ config SETTINGS
default y

config ZMS
default y if SOC_FLASH_NRF_RRAM
default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

config NVS
default y if !SOC_FLASH_NRF_RRAM
default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
4 changes: 2 additions & 2 deletions samples/bluetooth/central_nfc_pairing/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ config SETTINGS
default y

config ZMS
default y if SOC_FLASH_NRF_RRAM
default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

config NVS
default y if !SOC_FLASH_NRF_RRAM
default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
4 changes: 2 additions & 2 deletions samples/bluetooth/central_uart/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ config SETTINGS
default y

config ZMS
default y if SOC_FLASH_NRF_RRAM
default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

config NVS
default y if !SOC_FLASH_NRF_RRAM
default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
4 changes: 2 additions & 2 deletions samples/bluetooth/peripheral_bms/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ config SETTINGS
default y

config ZMS
default y if SOC_FLASH_NRF_RRAM
default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

config NVS
default y if !SOC_FLASH_NRF_RRAM
default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
4 changes: 2 additions & 2 deletions samples/bluetooth/peripheral_cgms/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ config SETTINGS
default y

config ZMS
default y if SOC_FLASH_NRF_RRAM
default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

config NVS
default y if !SOC_FLASH_NRF_RRAM
default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
4 changes: 2 additions & 2 deletions samples/bluetooth/peripheral_cts_client/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ config SETTINGS
default y

config ZMS
default y if SOC_FLASH_NRF_RRAM
default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

config NVS
default y if !SOC_FLASH_NRF_RRAM
default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
4 changes: 2 additions & 2 deletions samples/bluetooth/peripheral_lbs/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ config BT_LBS_SECURITY_ENABLED
select FLASH
select FLASH_PAGE_LAYOUT
select FLASH_MAP
select ZMS if SOC_FLASH_NRF_RRAM
select NVS if !SOC_FLASH_NRF_RRAM
select ZMS if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
select NVS if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
select SETTINGS
help
"Enable BLE security for the LED-Button service"
Expand Down
5 changes: 2 additions & 3 deletions samples/bluetooth/peripheral_mds/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ config SETTINGS
default y

config ZMS
default y if SOC_FLASH_NRF_RRAM

default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
config NVS
default y if !SOC_FLASH_NRF_RRAM
default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
4 changes: 2 additions & 2 deletions samples/bluetooth/peripheral_nfc_pairing/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ config SETTINGS
default y

config ZMS
default y if SOC_FLASH_NRF_RRAM
default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

config NVS
default y if !SOC_FLASH_NRF_RRAM
default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

endmenu

Expand Down
4 changes: 2 additions & 2 deletions samples/bluetooth/peripheral_power_profiling/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ config SETTINGS
default y

config ZMS
default y if SOC_FLASH_NRF_RRAM
default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

config NVS
default y if !SOC_FLASH_NRF_RRAM
default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

endmenu
4 changes: 2 additions & 2 deletions samples/bluetooth/peripheral_rscs/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ config BT_RSCS_SECURITY_ENABLED
select FLASH
select FLASH_PAGE_LAYOUT
select FLASH_MAP
select ZMS if SOC_FLASH_NRF_RRAM
select NVS if !SOC_FLASH_NRF_RRAM
select ZMS if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
select NVS if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
select SETTINGS
help
"Enable Bluetooth LE security for the Running Speed and Cadence Service"
Expand Down
4 changes: 2 additions & 2 deletions samples/bluetooth/peripheral_status/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ config BT_STATUS_SECURITY_ENABLED
select FLASH
select FLASH_PAGE_LAYOUT
select FLASH_MAP
select ZMS if SOC_FLASH_NRF_RRAM
select NVS if !SOC_FLASH_NRF_RRAM
select ZMS if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
select NVS if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
select SETTINGS
help
Enable BLE security implementation for Nordic Status Message instances.
Expand Down
4 changes: 2 additions & 2 deletions samples/bluetooth/peripheral_uart/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ config SETTINGS
default y

config ZMS
default y if SOC_FLASH_NRF_RRAM
default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

config NVS
default y if !SOC_FLASH_NRF_RRAM
default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

endmenu
4 changes: 2 additions & 2 deletions samples/bluetooth/rpc_host/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ config SETTINGS
default y

config ZMS
default y if SOC_FLASH_NRF_RRAM
default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

config NVS
default y if !SOC_FLASH_NRF_RRAM
default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)

0 comments on commit 86320e0

Please sign in to comment.