Added support for DFU of wi-fi firmware patch #14075

ArekBalysNordic · 2024-02-19T15:17:47Z

This commit allows performing Direct Firmware Update of Wi-Fi firmware patch that is located in the external memory.
This solution requires an additional MCUBoot partition pair (primary and secondary) and including the nrf70_wifi_fw partition within the primary partition.

Added Kconfig option to enable DFU support: NRF_WIFI_FW_PATCH_DFU
Aligned mcuboot's CMakeLists.txt file to sign the nrf70 FW patch
image and create the signed hex.
Added WiFi FW patch singed image to the multi-image target.

-Aligned Matter samples

TODO:

Documentation of the new feature
Align Matter configs

NordicBuilder · 2024-02-19T15:18:19Z

The following west manifest projects have been modified in this Pull Request:

Name	Old Revision	New Revision	Diff
matter	nrfconnect/sdk-connectedhomeip@`efdae04`	nrfconnect/sdk-connectedhomeip@`0b7d6e4` (master)	nrfconnect/[email protected]

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

NordicBuilder · 2024-02-19T15:50:38Z

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 Publishing GitHub Action.

NordicBuilder · 2024-02-20T09:53:48Z

Test specification

CI/Jenkins/NRF

Integration Platforms

CI/Jenkins/integration

Test Module	File based changes	Manually selected	West overwrite
test-fw-nrfconnect-boot	X
test-fw-nrfconnect-chip	X
test-fw-nrfconnect-zigbee	X
test-sdk-find-my	X
test-sdk-sidewalk	X
test-sdk-wifi	X

test-fw-nrfconnect-chip: added because there was no .github/test-spec.yml in 'matter'

Detailed information of selected test modules

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

modules/mcuboot/CMakeLists.txt

samples/matter/lock/sample.yaml

drivers/wifi/nrf700x/CMakeLists.txt

drivers/wifi/nrf700x/Kconfig

modules/mcuboot/CMakeLists.txt

ArekBalysNordic · 2024-02-26T12:39:13Z

@greg-fer @nordicjm We can postpone combining the XIP option and DFU of the patch. As @kittydepa wrote, work regarding documentation created within that PR will be continued in the following PR.

greg-fer · 2024-02-26T12:51:55Z

@greg-fer @nordicjm We can postpone combining the XIP option and DFU of the patch. As @kittydepa wrote, work regarding documentation created within that PR will be continued in the following PR.

OK, it's yours and Pluto's call.

greg-fer

+1 to unblock, assuming the promised PR for documentation will address the remaining changes.

jfischer-no · 2024-02-26T13:39:17Z

@nordicjm ptal

tejlmand · 2024-02-26T14:24:59Z

samples/matter/lock/CMakeLists.txt

 if(CONF_FILE_NAME STREQUAL "prj_thread_wifi_switched.conf")
+    set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_SOURCE_DIR}/configuration/${BOARD}/pm_static_dfu_wifi_ext_patch.yml)


why is this needed ?

We should really not be doing such tests and adjustments before find_package(Zephyr).

Secondly, the prj_thread_wifi_switched.conf seems to be using the prj_<build_type>.conf scheme:
https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/config_and_build/configuring_app/advanced_building.html#configuring-build-types
in which case the pm static file ought to be named: pm_static_thread_wifi_switched.yml

Finally, I see three boards here:
https://github.com/nrfconnect/sdk-nrf/tree/678f466b8563b3ce76416da9f6a140c9d807e640/samples/matter/lock/configuration

but only one is having the pm_static_dfu_wifi_ext_patch.yml, so I assume if building for one of the other boards with prj_thread_wifi_switched.conf is going to fail.

ArekBalysNordic · 2024-02-26T15:31:51Z

@tejlmand It is needed because we need to have another pm_static.yml file for this specific purpose. Currently, we support this feature only for the nRF5340 DK + nRF7002EK variant, so yes, building for other boards with prj_thread_wifi_switched.conf will fail. We have it described in our documentation - in the README of the Matter Lock sample.

How can I manage that in the other way than placing it before find_package(Zephyr)? Are there possibilities for that?

As I can see in the common CMakeLists: https://github.com/nrfconnect/sdk-nrf/blob/main/samples/CMakeLists.txt#L105-L146 we have a lot of "hidden" pm_static.yaml invocations depending on Kconfigs.

I did it this way because it is clear that it will be added automatically if the prj_thread_wifi_switched.conf is selected. I would like to simplify our samples for our customers, and not force them to add many arguments to the "west build" command.

OK, now I see that the pm_static file ought to be named pm_static_thread_wifi_switched.yml so I will rename it.

Added Kconfig option to enable DFU support: NRF_WIFI_FW_PATCH_DFU If the kconfig option is enabled then the nrf70.hex file should not be added to the merged.hex file, so disabled adding it in the nrf700x driver configuration. Signed-off-by: Arkadiusz Balys <[email protected]>

This commit allows performing Direct Firmware Update of Wi-Fi firmware patch that is located in the external memory. This solution requires an additional mcuboot partition pair (primary and secondary) and including the nrf70_wifi_fw partition within the primary partition. - Aligned mcuboot's CMakeLists.txt file to sign the nrf70 FW patch image and create the signed hex. - Added WiFi FW patch singed image to the multi-image target. Signed-off-by: Arkadiusz Balys <[email protected]>

This commit adds proper partitions and configs to use WiFi FW patch located on the external memory. Signed-off-by: Arkadiusz Balys <[email protected]>

Describe the requirements, application preparation, required partitions, and build system configuration. Linked newly created page in Matter samples and Wi-Fi firmware patch docs. Signed-off-by: Arkadiusz Balys <[email protected]>

tejlmand

approving as there is a followup plan with an asignee.

Addressed

github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Feb 19, 2024

NordicBuilder added manifest-matter DNM labels Feb 19, 2024

ArekBalysNordic marked this pull request as ready for review February 20, 2024 09:28

ArekBalysNordic requested review from Damian-Nordic, kkasperczyk-no, de-nordic, nordicjm, krish2718, sachinthegreen, rado17, rlubos, carlescufi and tejlmand as code owners February 20, 2024 09:28

ArekBalysNordic requested review from markaj-nordic and LuDuda February 20, 2024 09:28

de-nordic requested a review from nvlsianpu February 20, 2024 09:37

ArekBalysNordic force-pushed the wifi_ext_patch branch from 20b38e5 to 5105fde Compare February 20, 2024 09:46

Damian-Nordic reviewed Feb 20, 2024

View reviewed changes

modules/mcuboot/CMakeLists.txt Show resolved Hide resolved

samples/matter/lock/sample.yaml Outdated Show resolved Hide resolved

ArekBalysNordic requested a review from doublemis1 February 20, 2024 11:19

krish2718 reviewed Feb 20, 2024

View reviewed changes

drivers/wifi/nrf700x/CMakeLists.txt Show resolved Hide resolved

ArekBalysNordic force-pushed the wifi_ext_patch branch 4 times, most recently from 36ce2b4 to df91d0d Compare February 20, 2024 12:56

krish2718 approved these changes Feb 20, 2024

View reviewed changes

drivers/wifi/nrf700x/Kconfig Outdated Show resolved Hide resolved

modules/mcuboot/CMakeLists.txt Show resolved Hide resolved

kittydepa self-requested a review February 26, 2024 09:17

ArekBalysNordic force-pushed the wifi_ext_patch branch from 2b22fb9 to fe0a6ff Compare February 26, 2024 09:30

ArekBalysNordic requested review from greg-fer and richabp February 26, 2024 09:30

richabp approved these changes Feb 26, 2024

View reviewed changes

kittydepa approved these changes Feb 26, 2024

View reviewed changes

ArekBalysNordic force-pushed the wifi_ext_patch branch from fe0a6ff to e7996a7 Compare February 26, 2024 12:24

nvlsianpu approved these changes Feb 26, 2024

View reviewed changes

ArekBalysNordic force-pushed the wifi_ext_patch branch from e7996a7 to 5d5b253 Compare February 26, 2024 12:34

ArekBalysNordic requested a review from nordicjm February 26, 2024 12:39

greg-fer approved these changes Feb 26, 2024

View reviewed changes

ArekBalysNordic force-pushed the wifi_ext_patch branch 3 times, most recently from 0e9e892 to 678f466 Compare February 26, 2024 13:20

tejlmand requested changes Feb 26, 2024

View reviewed changes

ArekBalysNordic force-pushed the wifi_ext_patch branch from 678f466 to a4fc216 Compare February 27, 2024 09:25

ArekBalysNordic added 4 commits February 28, 2024 13:53

samples: Matter: Align samples to use WiFi FW patch on external memory

702272a

This commit adds proper partitions and configs to use WiFi FW patch located on the external memory. Signed-off-by: Arkadiusz Balys <[email protected]>

doc: Add a page for DFU of nRF70 Series firmware patch

63f6c7b

Describe the requirements, application preparation, required partitions, and build system configuration. Linked newly created page in Matter samples and Wi-Fi firmware patch docs. Signed-off-by: Arkadiusz Balys <[email protected]>

ArekBalysNordic force-pushed the wifi_ext_patch branch from a4fc216 to 63f6c7b Compare February 28, 2024 12:53

NordicBuilder removed the DNM label Feb 28, 2024

tejlmand approved these changes Feb 28, 2024

View reviewed changes

jfischer-no merged commit 7885388 into nrfconnect:main Feb 28, 2024
19 of 20 checks passed

kittydepa mentioned this pull request Feb 29, 2024

doc improvement: move wifi fw page #14273

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added support for DFU of wi-fi firmware patch #14075

Added support for DFU of wi-fi firmware patch #14075

ArekBalysNordic commented Feb 19, 2024 •

edited

Loading

NordicBuilder commented Feb 19, 2024 •

edited

Loading

NordicBuilder commented Feb 19, 2024

NordicBuilder commented Feb 20, 2024 •

edited

Loading

ArekBalysNordic commented Feb 26, 2024

greg-fer commented Feb 26, 2024

greg-fer left a comment

jfischer-no commented Feb 26, 2024

tejlmand Feb 26, 2024 •

edited

Loading

ArekBalysNordic commented Feb 26, 2024

tejlmand left a comment

		if(CONF_FILE_NAME STREQUAL "prj_thread_wifi_switched.conf")
		set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_SOURCE_DIR}/configuration/${BOARD}/pm_static_dfu_wifi_ext_patch.yml)

Added support for DFU of wi-fi firmware patch #14075

Added support for DFU of wi-fi firmware patch #14075

Conversation

ArekBalysNordic commented Feb 19, 2024 • edited Loading

NordicBuilder commented Feb 19, 2024 • edited Loading

NordicBuilder commented Feb 19, 2024

NordicBuilder commented Feb 20, 2024 • edited Loading

Test specification

CI/Jenkins/NRF

CI/Jenkins/integration

ArekBalysNordic commented Feb 26, 2024

greg-fer commented Feb 26, 2024

greg-fer left a comment

Choose a reason for hiding this comment

jfischer-no commented Feb 26, 2024

tejlmand Feb 26, 2024 • edited Loading

Choose a reason for hiding this comment

ArekBalysNordic commented Feb 26, 2024

tejlmand left a comment

Choose a reason for hiding this comment

ArekBalysNordic commented Feb 19, 2024 •

edited

Loading

NordicBuilder commented Feb 19, 2024 •

edited

Loading

NordicBuilder commented Feb 20, 2024 •

edited

Loading

tejlmand Feb 26, 2024 •

edited

Loading