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

Add ZMS as default storage subsystem for Soc family that has MRAM #19286

Merged
merged 2 commits into from
Dec 9, 2024

Conversation

rghaddab
Copy link
Contributor

@rghaddab rghaddab commented Dec 5, 2024

For some samples ZMS is still not selected as the default storage subsystem when the SoC family has an MRAM flash

Some bluetooth samples are still selecting NVS for boards that have mram
technologies instead of ZMS.
Fix this by adding the missing CONFIG dependency

Signed-off-by: Riadh Ghaddab <[email protected]>
@rghaddab rghaddab requested a review from a team as a code owner December 5, 2024 11:16
@github-actions github-actions bot added the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Dec 5, 2024
@rghaddab rghaddab force-pushed the rghaddab/add-mram-flash-config branch from 1955514 to fe7ca22 Compare December 5, 2024 11:20
@@ -37,7 +37,7 @@ config SETTINGS
default y

config ZMS
default y if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@pdunaj Why was this set to the opposite ?

@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

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

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Dec 5, 2024

CI Information

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

Inputs:

Sources:

sdk-nrf: PR head: 0cd24bd676612aa7f6a2f2a39af6d97a8563ac9b

more details

sdk-nrf:

PR head: 0cd24bd676612aa7f6a2f2a39af6d97a8563ac9b
merge base: 138a660291cb44f6de9bb9aa78c8e08d9677943b
target head (main): cca916add9e6428c8ded5f46f49c40504c6e6e61
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 (7)
samples
│  ├── bluetooth
│  │  ├── enocean
│  │  │  │ Kconfig
│  │  ├── fast_pair
│  │  │  ├── locator_tag
│  │  │  │  │ Kconfig
│  │  ├── peripheral_ams_client
│  │  │  │ Kconfig
│  │  ├── peripheral_ancs_client
│  │  │  │ Kconfig
│  │  ├── peripheral_mds
│  │  │  │ Kconfig
│  │  ├── peripheral_uart
│  │  │  │ Kconfig
subsys
│  ├── net
│  │  ├── openthread
│  │  │  ├── settings_check
│  │  │  │  │ CMakeLists.txt

Outputs:

Toolchain

Version: b77d8c1312
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:b77d8c1312_912848a074

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

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

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

@rghaddab rghaddab added this to the 2.9.0-nRF54H20 milestone Dec 6, 2024
Adds the warning in the CMakeLists.txt when NVS is selected for the
nRF54H SoC family as well

Signed-off-by: Riadh Ghaddab <[email protected]>
@rlubos rlubos merged commit 13c0c90 into nrfconnect:main Dec 9, 2024
13 checks passed
@kapi-no
Copy link
Contributor

kapi-no commented Dec 11, 2024

This storage change wasn't needed in the Locator Tag sample as the nRF54H is not supported as part of this sample. The sample Kconfig change implies now that this sample supports MRAM targets

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants