Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes Kconfig options changed in sdk-zephyr #20495

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

rghaddab
Copy link
Contributor

Fixes Kconfig options changed by this PR: nrfconnect/sdk-zephyr#2525

@rghaddab rghaddab requested review from a team and annwoj as code owners February 19, 2025 13:52
@github-actions github-actions bot added doc-required PR must not be merged without tech writer approval. manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Feb 19, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Feb 19, 2025

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff
matter nrfconnect/sdk-connectedhomeip@7e18666 nrfconnect/sdk-connectedhomeip#557 nrfconnect/sdk-connectedhomeip#557/files
zephyr nrfconnect/sdk-zephyr@0aa2141 nrfconnect/sdk-zephyr#2525 nrfconnect/sdk-zephyr#2525/files

DNM label due to: 2 projects with PR revision

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@@ -14,6 +14,7 @@ CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
CONFIG_DCACHE=n

# Set the ZMS sector count to match the settings partition size that is 32 kB for this application.
CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's better to just remove this custom count and use the entire partition.

Copy link
Contributor Author

@rghaddab rghaddab Feb 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Damian-Nordic That's something that I ignore based on each application/sample code.
By default the new backend will use the entire partition.
But I don't know if these applications/sample want to use the entire partition or only the configured number

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Each team should verify whether this option is needed for their app/sample or not.
But at least using the CUSTOM_CONFIG that won't change anything in the current configuration

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Damian-Nordic should I removed it for matter sample code ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I think for Matter it can be safely removed. For others I'm not sure so you're right it's better to leave this decision to app owners :)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would say we want to use the full partition. I've changed the sector count, because it turned out that backend implementation does not care about partition size and uses only the size determined by sector count Kconfig. So my solution was sort of workaround. If this is fixed now, I don't think we need custom sector count anymore.

@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link.

Note: This comment is automatically posted by the Documentation Publish GitHub Action.

@rghaddab rghaddab requested a review from omkar3141 February 19, 2025 14:13
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Feb 19, 2025

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 22

Inputs:

Sources:

nrf_hw_models: PR head: 73a5d5827a94820be65b7d276d28173ec10bab9f
sdk-nrf: PR head: 73bc43bfa230e92de6e88718b4b7988789dfd131
matter: PR head: f0c1631796cc94e95a8bec2e9724d968f6ea5d3a
zephyr: PR head: d8031a0480a3349c7bdea422ce74472fe37a6fbc

more details

nrf_hw_models:

PR head: 73a5d5827a94820be65b7d276d28173ec10bab9f
merge base: 4aac556e50e5150eafc3b35f0f5c2faaef55e739
Diff

sdk-nrf:

PR head: 73bc43bfa230e92de6e88718b4b7988789dfd131
merge base: 683da1a3a9e4fd675f2d8e84bd81c98c86c658c2
target head (main): 683da1a3a9e4fd675f2d8e84bd81c98c86c658c2
Diff

matter:

PR head: f0c1631796cc94e95a8bec2e9724d968f6ea5d3a
merge base: a85d6b0e6c891119c910a7c81124c6a5ab2b863a
target head (master): ded174bf014e105478fcfd7c2ab45cc22b98f91f
Diff

zephyr:

PR head: d8031a0480a3349c7bdea422ce74472fe37a6fbc
merge base: 0aa2141d605f3b39da2b541e2fe4595d58824080
target head (main): d4452311ef53db6c7deff4c6fe2802bd88c310d9
Diff

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (119)
applications
│  ├── matter_bridge
│  │  ├── boards
│  │  │  │ nrf54h20dk_nrf54h20_cpuapp.conf
doc
│  ├── nrf
│  │  ├── app_dev
│  │  │  ├── device_guides
│  │  │  │  ├── nrf54l
│  │  │  │  │  │ zms.rst
modules
│  ├── bsim_hw_models
│  │  ├── nrf_hw_models
│  │  │  ├── docs
│  │  │  │  │ README_impl_status.md
│  │  │  ├── src
│  │  │  │  ├── HW_models
│  │  │  │  │  ├── NHW_54L_CLOCK.c
│  │  │  │  │  ├── NHW_54_AAR_CCM_ECB.c
│  │  │  │  │  ├── NHW_CLOCK.c
│  │  │  │  │  ├── NHW_RADIO.c
│  │  │  │  │  ├── NHW_UART.c
│  │  │  │  │  ├── NHW_UART_private.h
│  │  │  │  │  │ NHW_config.h
│  ├── lib
│  │  ├── matter
│  │  │  ├── config
│  │  │  │  ├── nrfconnect
│  │  │  │  │  ├── chip-module
│  │  │  │  │  │  │ Kconfig
samples
│  ├── bluetooth
│  │  ├── mesh
│  │  │  ├── ble_peripheral_lbs_coex
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54l15dk_nrf54l05_cpuapp.conf
│  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  ├── chat
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54l15dk_nrf54l05_cpuapp.conf
│  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  ├── dfu
│  │  │  │  ├── distributor
│  │  │  │  │  ├── boards
│  │  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  │  ├── target
│  │  │  │  │  ├── boards
│  │  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  ├── light
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54l15dk_nrf54l05_cpuapp.conf
│  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  ├── light_ctrl
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54l15dk_nrf54l05_cpuapp.conf
│  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  ├── light_dimmer
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54l15dk_nrf54l05_cpuapp.conf
│  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  ├── light_switch
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54l15dk_nrf54l05_cpuapp.conf
│  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  ├── sensor_client
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54l15dk_nrf54l05_cpuapp.conf
│  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  ├── sensor_server
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54l15dk_nrf54l05_cpuapp.conf
│  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  ├── silvair_enocean
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54l15dk_nrf54l05_cpuapp.conf
│  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  ├── matter
│  │  ├── light_bulb
│  │  │  ├── boards
│  │  │  │  ├── nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp_ns.conf
│  │  ├── light_switch
│  │  │  ├── boards
│  │  │  │  ├── nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp_ns.conf
│  │  ├── lock
│  │  │  ├── boards
│  │  │  │  ├── nrf54h20dk_nrf54h20_cpuapp.conf
│  │  │  │  ├── nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp_ns.conf
│  │  ├── smoke_co_alarm
│  │  │  ├── boards
│  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  ├── template
│  │  │  ├── boards
│  │  │  │  ├── nrf54h20dk_nrf54h20_cpuapp.conf
│  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  ├── nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  │  ├── nrf54l15dk_nrf54l15_cpuapp_internal.conf
│  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp_ns.conf
│  │  ├── thermostat
│  │  │  ├── boards
│  │  │  │  ├── nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp_ns.conf
│  │  ├── window_covering
│  │  │  ├── boards
│  │  │  │  ├── nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp_ns.conf
west.yml
zephyr
│  ├── boards
│  │  ├── native
│  │  │  ├── nrf_bsim
│  │  │  │  ├── doc
│  │  │  │  │  ├── nrf52_bsim.rst
│  │  │  │  │  │ nrf54l15bsim.rst
│  │  │  │  ├── irq_handler.c
│  │  │  │  ├── nrf52_bsim.dts
│  │  │  │  ├── nrf52_bsim_defconfig
│  │  │  │  ├── nrf5340bsim_nrf5340_cpuapp.dts
│  │  │  │  │ nrf54l15bsim_nrf54l15_cpuapp.dts
│  │  ├── nordic
│  │  │  ├── nrf54l09pdk
│  │  │  │  ├── Kconfig.defconfig
│  │  │  │  │ nrf54l09_cpuapp_common.dtsi
│  │  │  ├── nrf54l20pdk
│  │  │  │  ├── Kconfig.defconfig
│  │  │  │  │ nrf54l20_cpuapp_common.dtsi
│  ├── cmake
│  │  ├── reports
│  │  │  │ CMakeLists.txt
│  ├── doc
│  │  ├── services
│  │  │  ├── storage
│  │  │  │  ├── zms
│  │  │  │  │  │ zms.rst
│  │  │ zephyr.doxyfile.in
│  ├── drivers
│  │  ├── counter
│  │  │  │ counter_nrfx_timer.c
│  │  ├── i2c
│  │  │  ├── i2c_nrfx_twim_rtio.c
│  │  │  │ i2c_nrfx_twis.c
│  │  ├── pwm
│  │  │  │ pwm_nrfx.c
│  ├── dts
│  │  ├── common
│  │  │  ├── nordic
│  │  │  │  ├── nrf54l09.dtsi
│  │  │  │  ├── nrf54l20.dtsi
│  │  │  │  │ nrf54l_05_10_15.dtsi
│  ├── include
│  │  ├── zephyr
│  │  │  ├── drivers
│  │  │  │  ├── clock_control
│  │  │  │  │  │ nrf_clock_control.h
│  │  │  ├── fs
│  │  │  │  │ zms.h
│  ├── modules
│  │  ├── hal_nordic
│  │  │  ├── Kconfig
│  │  │  ├── nrf_802154
│  │  │  │  ├── sl_opensource
│  │  │  │  │  ├── platform
│  │  │  │  │  │  │ nrf_802154_clock_zephyr.c
│  │  │  ├── nrfx
│  │  │  │  │ CMakeLists.txt
│  ├── samples
│  │  ├── bluetooth
│  │  │  ├── bap_unicast_client
│  │  │  │  ├── src
│  │  │  │  │  │ stream_tx.c
│  │  │  ├── cap_acceptor
│  │  │  │  ├── src
│  │  │  │  │  ├── cap_acceptor_unicast.c
│  │  │  │  │  │ main.c
│  │  │  ├── cap_initiator
│  │  │  │  ├── src
│  │  │  │  │  ├── cap_initiator_unicast.c
│  │  │  │  │  │ main.c
│  │  ├── drivers
│  │  │  ├── i2c
│  │  │  │  ├── rtio_loopback
│  │  │  │  │  ├── boards
│  │  │  │  │  │  ├── nrf5340dk_nrf5340_cpuapp.conf
│  │  │  │  │  │  ├── nrf5340dk_nrf5340_cpuapp.overlay
│  │  │  │  │  │  ├── nrf54h20dk_nrf54h20_cpuapp.conf
│  │  │  │  │  │  ├── nrf54h20dk_nrf54h20_cpuapp.overlay
│  │  │  │  │  │  ├── nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.overlay
│  │  │  │  │  │ sample.yaml
│  ├── soc
│  │  ├── nordic
│  │  │  ├── common
│  │  │  │  │ soc_nrf_common.h
│  │  │  ├── nrf54l
│  │  │  │  │ soc.c
│  ├── subsys
│  │  ├── fs
│  │  │  ├── zms
│  │  │  │  ├── CMakeLists.txt
│  │  │  │  ├── Kconfig
│  │  │  │  ├── zms.c
│  │  │  │  │ zms_priv.h
│  │  ├── logging
│  │  │  ├── frontends
│  │  │  │  ├── stmesp
│  │  │  │  │  │ zephyr_custom_log.h
│  │  ├── settings
│  │  │  ├── Kconfig
│  │  │  ├── include
│  │  │  │  ├── settings
│  │  │  │  │  │ settings_zms.h
│  │  │  ├── src
│  │  │  │  │ settings_zms.c
│  ├── tests
│  │  ├── bluetooth
│  │  │  ├── mesh_shell
│  │  │  │  ├── boards
│  │  │  │  │  │ qemu_x86.conf
│  │  │  │  │ prj.conf
│  │  ├── drivers
│  │  │  ├── i2c
│  │  │  │  ├── i2c_target_api
│  │  │  │  │  ├── boards
│  │  │  │  │  │  ├── nrf54h20dk_nrf54h20_cpuapp.conf
│  │  │  │  │  │  ├── nrf54h20dk_nrf54h20_cpuapp.overlay
│  │  │  │  │  │  ├── nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.overlay
│  │  │  │  │  │ testcase.yaml
│  │  │  ├── mspi
│  │  │  │  ├── api
│  │  │  │  │  ├── boards
│  │  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.overlay
│  │  ├── kernel
│  │  │  ├── timer
│  │  │  │  ├── timer_api
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ main.c
│  │ west.yml

Outputs:

Toolchain

Version: aedb4c0245
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:aedb4c0245_bece0367df

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
    • sdk-nrf test count: 2007
    • sdk-zephyr test count: 3376
  • ❌ Integration tests
    • ✅ test-sdk-audio
    • ❌ test_ble_nrf_config
    • ✅ test-fw-nrfconnect-ble_mesh
    • ✅ test-fw-nrfconnect-ble_samples
    • ✅ test-fw-nrfconnect-chip
    • ✅ test-fw-nrfconnect-nfc
    • ❌ test-fw-nrfconnect-nrf-iot_cloud
    • ✅ test-fw-nrfconnect-nrf-iot_thingy91
    • ✅ test-fw-nrfconnect-rs
    • ✅ test-fw-nrfconnect-fem
    • ✅ test-fw-nrfconnect-thread
    • ✅ test-sdk-find-my
    • ✅ test-fw-nrfconnect-nrf-iot_mosh
    • ❌ test-fw-nrfconnect-nrf-iot_positioning
    • ✅ test-sdk-sidewalk
    • ✅ test-low-level
    • ✅ test-sdk-dfu
Disabled integration tests
    • desktop52_verification
    • doc-internal
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-boot
    • test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_samples
    • test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • test-fw-nrfconnect-nrf_crypto
    • test-fw-nrfconnect-proprietary_esb
    • test-fw-nrfconnect-ps
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-tfm
    • test-fw-nrfconnect-zigbee
    • test-sdk-mcuboot
    • test-sdk-pmic-samples
    • test-sdk-wifi
    • test-secdom-samples-public

Note: This message is automatically posted and updated by the CI

Copy link

github-actions bot commented Feb 20, 2025

After documentation is built, you will find the preview for this PR here.

Preview links for modified nRF Connect SDK documents:

https://ncsdoc.z6.web.core.windows.net/PR-20495/nrf/app_dev/device_guides/nrf54l/zms.html

Copy link
Contributor

@omkar3141 omkar3141 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since name cache is now replaced by hashing mechanism for ZMS settings backend, the corresponding Kconfig settings are invalid and removed from samples. Looks fine to me.

Copy link

@shanthanordic shanthanordic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agreed for scope

@adigie adigie force-pushed the rghaddab/pr-20487 branch 2 times, most recently from 11c4361 to 1cd2d30 Compare February 21, 2025 14:39
@rghaddab rghaddab force-pushed the rghaddab/pr-20487 branch 5 times, most recently from 794da99 to bd61cff Compare February 25, 2025 07:58
NordicBuilder and others added 2 commits February 25, 2025 17:24
Automatically created by Github Action

Signed-off-by: Nordic Builder <[email protected]>
with the new ZMS backend for settings some Kconfig options are not
needed and others must be enabled.

Signed-off-by: Riadh Ghaddab <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport v2.9-nRF54H20-branch changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. DNM doc-required PR must not be merged without tech writer approval. manifest manifest-matter manifest-zephyr
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants