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

sysbuild: nrf70: Use PM for external flash store #20042

Merged
merged 1 commit into from
Jan 29, 2025
Merged

sysbuild: nrf70: Use PM for external flash store #20042

merged 1 commit into from
Jan 29, 2025

Conversation

krish2718
Copy link
Contributor

@krish2718 krish2718 commented Jan 22, 2025 •
edited
Loading

Drop support for non-PM based build for external flash support, now PM is mandatory for cross-platform support.

Fix SHEL-3355.

@krish2718 krish2718 requested a review from a team as a code owner January 22, 2025 15:56
@krish2718 krish2718 requested review from krga2022 and visinor January 22, 2025 15:57
@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 Jan 22, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Jan 22, 2025 •
edited
Loading

CI Information

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

Inputs:

Sources:

sdk-nrf: PR head: 04b7f207aa0f891bd52a9a0b594104659adcc5e9

more details

sdk-nrf:

PR head: 04b7f207aa0f891bd52a9a0b594104659adcc5e9
merge base: 115359d6f2e3970e2bf5a17fefb2608c86a3917e
target head (main): 8f6412f03f66ab97bda89ecb185b51393206fdf0
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 (8) 
doc
│  ├── nrf
│  │  ├── app_dev
│  │  │  ├── device_guides
│  │  │  │  ├── nrf70
│  │  │  │  │  │ fw_patches_ext_flash.rst
│  │  ├── releases_and_maturity
│  │  │  ├── releases
│  │  │  │  │ release-notes-changelog.rst
samples
│  ├── wifi
│  │  ├── shell
│  │  │  │ sample.yaml
snippets
│  ├── nrf70-fw-patch-ext-flash
│  │  │ fw-patch-ext-flash.overlay
subsys
│  ├── partition_manager
│  │  ├── CMakeLists.txt
│  │  ├── Kconfig
│  │  │ pm.yml.wifi
sysbuild
│  │ Kconfig.wifi

Outputs:

Toolchain

Version: 342151af73
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:342151af73_912848a074

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

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister - Skipped: Skipping Build & Test as it succeeded in a previous run: 5
  • ✅ Integration tests
    • ✅ test-sdk-audio - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ desktop52_verification - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-boot
    • ✅ test-fw-nrfconnect-apps - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test_ble_nrf_config - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-ble_mesh - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-ble_samples - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-chip
    • ✅ test-fw-nrfconnect-nfc - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_serial_lte_modem - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_zephyr_lwm2m - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_samples - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_lwm2m - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ doc-internal - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_thingy91 - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf_crypto - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-rpc - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-rs - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-fem - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-tfm - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-thread - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-zigbee - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-find-my - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_mosh - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_positioning - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-sidewalk - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-wifi - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-low-level - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-pmic-samples
    • ✅ test-sdk-mcuboot - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-dfu - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-ps - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-secdom-samples-public - Skipped: Job was skipped as it succeeded in a previous run
    • ⚠️ test-fw-nrfconnect-fw-update
    • ⚠️ test-fw-nrfconnect-nrf-iot_cloud

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

@krish2718 krish2718 force-pushed the fix_ext_flash_store branch from 267e209 to bdb22f2 Compare January 27, 2025 12:23
@krish2718 krish2718 requested review from tejlmand, rado17 and a team as code owners January 27, 2025 12:23
@github-actions github-actions bot added the doc-required PR must not be merged without tech writer approval. label Jan 27, 2025
@krish2718 krish2718 changed the title sysbuild: nrf70: Fix external flash store when PM is disabled sysbuild: nrf70: Use PM for external flash store Jan 27, 2025
@krish2718
Copy link
Contributor Author

@visinor please retest the strategy has changed and docs updated.

@krish2718
Copy link
Contributor Author

@ArekBalysNordic can you please check if this affects Matter samples? We now have the Wi-Fi partition defined in the PM subsystem itself.

@krish2718 krish2718 requested a review from LuDuda January 27, 2025 12:27
@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.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Jan 27, 2025 •
edited
Loading

Memory footprint analysis revealed the following potential issues

sample.matter.template.release[nrf7002dk/nrf5340/cpuapp]: High ROM usage: 821138[B] - link (cc: @kkasperczyk-no @ArekBalysNordic @markaj-nordic)
sample.matter.template.debug[nrf7002dk/nrf5340/cpuapp]: High ROM usage: 912198[B] - link (cc: @kkasperczyk-no @ArekBalysNordic @markaj-nordic)

Note: This message is automatically posted and updated by the CI (latest/sdk-nrf/PR-20042/5)

@ArekBalysNordic
Copy link
Contributor

@ArekBalysNordic can you please check if this affects Matter samples? We now have the Wi-Fi partition defined in the PM subsystem itself.

Let me check. I'm a bit worried because The patch is located after the [settings_storage] in the external flash, whereas we have settings_storage within the internal memory, and in the external flash there is a mcuboot secondary partition. I will check locally how it works on this PR.

@ArekBalysNordic
Copy link
Contributor

@ArekBalysNordic can you please check if this affects Matter samples? We now have the Wi-Fi partition defined in the PM subsystem itself.

Let me check. I'm a bit worried because The patch is located after the [settings_storage] in the external flash, whereas we have settings_storage within the internal memory, and in the external flash there is a mcuboot secondary partition. I will check locally how it works on this PR.

Ok, we have our own pm_static.yaml for that, and we set this partition statically according to mcuboot's secondary partitions. So no matter what is defined in the global pm definitions. We just need to have consistent names, so as long as it is called nrf70_wifi_fw it seems to be ok. :)

richabp
richabp requested changes Jan 27, 2025
View reviewed changes
Copy link
Contributor

@richabp richabp left a comment

Choose a reason for hiding this comment

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

Does it require a changelog entry?

doc/nrf/app_dev/device_guides/nrf70/fw_patches_ext_flash.rst Outdated Show resolved Hide resolved
doc/nrf/app_dev/device_guides/nrf70/fw_patches_ext_flash.rst Outdated Show resolved Hide resolved
doc/nrf/app_dev/device_guides/nrf70/fw_patches_ext_flash.rst Outdated Show resolved Hide resolved
@krish2718 krish2718 force-pushed the fix_ext_flash_store branch from bdb22f2 to 0cec495 Compare January 27, 2025 16:15
@krish2718 krish2718 requested a review from a team as a code owner January 27, 2025 16:15
@krish2718 krish2718 requested a review from richabp January 27, 2025 16:15
@github-actions github-actions bot removed the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Jan 27, 2025
@krish2718 krish2718 force-pushed the fix_ext_flash_store branch from 0cec495 to 1e5bcf7 Compare January 28, 2025 11:16
nordicjm
nordicjm reviewed Jan 28, 2025
View reviewed changes
subsys/partition_manager/CMakeLists.txt Outdated Show resolved Hide resolved
subsys/partition_manager/Kconfig Outdated Show resolved Hide resolved
@krish2718
wifi: ext_flash: Add a new partition for storing nRF70 FW patches
04b7f20 
Add a dedicated Wi-Fi partition for storing nRF70 firmware patches on
external flash.

Signed-off-by: Chaitanya Tata <[email protected]>
@krish2718 krish2718 force-pushed the fix_ext_flash_store branch from 1e5bcf7 to 04b7f20 Compare January 28, 2025 12:00
@krish2718 krish2718 requested review from peknis and nordicjm January 29, 2025 06:45
nordicjm
nordicjm approved these changes Jan 29, 2025
View reviewed changes
snippets/nrf70-fw-patch-ext-flash/fw-patch-ext-flash.overlay
reg = <0x0 DT_SIZE_K(128)>;
};
};
/{
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
/{
/ {

Rather than re-run CI, please fix up in a future commit e.g. when sysbuild support is added to snippets

@nordicjm nordicjm merged commit 8c3501f into nrfconnect:main Jan 29, 2025
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@visinor visinor visinor approved these changes

@sachinthegreen sachinthegreen sachinthegreen approved these changes

@rado17 rado17 rado17 approved these changes

@richabp richabp richabp approved these changes

@peknis peknis peknis approved these changes

@nordicjm nordicjm nordicjm approved these changes

@rlubos rlubos rlubos approved these changes

@krga2022 krga2022 Awaiting requested review from krga2022

@tejlmand tejlmand Awaiting requested review from tejlmand tejlmand is a code owner

@ArekBalysNordic ArekBalysNordic Awaiting requested review from ArekBalysNordic

@LuDuda LuDuda Awaiting requested review from LuDuda

Assignees
No one assigned
Labels
doc-required PR must not be merged without tech writer approval.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@krish2718 @NordicBuilder @ArekBalysNordic @rlubos @nordicjm @peknis @richabp @rado17 @sachinthegreen @visinor