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.

Sign up for GitHub

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

Jump to bottom

manifest: sdk-zephyr: ZMS a new memory storage system #17502

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

manifest: sdk-zephyr: ZMS a new memory storage system #17502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21cd8df
manifest: Update sdk-zephyr revision (auto-manifest PR)
NordicBuilder Sep 24, 2024
88e306e
flash_map_pm: add support for ZMS storage
rghaddab Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion include/flash_map_pm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
#define image_scratch mcuboot_scratch
#define image_scratch mcuboot_scratch

#if (CONFIG_SETTINGS_FCB || CONFIG_SETTINGS_NVS || defined(PM_SETTINGS_STORAGE_ID))
#if (CONFIG_SETTINGS_FCB || CONFIG_SETTINGS_NVS || defined(PM_SETTINGS_STORAGE_ID) ||\
CONFIG_SETTINGS_ZMS)
#define storage settings_storage
#define storage_partition settings_storage
#elif CONFIG_FILE_SYSTEM_LITTLEFS
Expand All @@ -38,6 +39,9 @@
#elif CONFIG_NVS
#define storage nvs_storage
#define storage_partition nvs_storage
#elif CONFIG_ZMS
#define storage zms_storage
#define storage_partition zms_storage
#endif

#define PM_ID(label) PM_##label##_ID
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 4322f5169f4c0f24e3712de061a2fec5a29098a7
revision: pull/2045/head
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading