-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
sysbuild: Add b0 zip update output generation without MCUboot #15463
Conversation
Adds a dfu_application.zip output file which contains the update bin files when secure boot is used without MCUboot being enabled Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Test specificationCI/Jenkins/NRF
CI/Jenkins/integration
Detailed information of selected test modules Note: This message is automatically posted and updated by the CI |
@@ -94,6 +94,10 @@ function(include_fw_zip) | |||
include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/zip.cmake) | |||
endfunction() | |||
|
|||
function(include_b0_packaging) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I assume the creation of a function to include a CMake file is done because of scoping.
If so, then a comment would be nice, as there is really not a reason for other to look at this and think that sourcing of CMake files should be done like this in general.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No actually this was done because you submitted the original for include_provision_hex
which did it this way (and that file actually has its own function that gets called inside of that file)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
and include_provision_hex()
was exactly done like that because of scoping, because the provision_hex.cmake
file imports the kconfig and thus defines several CONFIG_
settings which would be polluting the scope.
import_kconfig(CONFIG_ ${BINARY_DIR}/zephyr/.config) |
But agreed, the include_provision_hex()
should actually have a comment in this regard.
Generally there are no reason for such a pattern, but in the case of the provision_hex.cmake
, then that file is shared between sysbuild and parent/child builds and must use common prefix for loading the kconfig into scope and thus there is a reason for including the CMake file through a function.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
approved for now, but comment #15463 (comment) should be addressed in follow up.
Change brings back backwards compatibility to ensure compatibility with existing tools and applications. Jira: NCSDK-27566 Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
Pushed my backwards compatibility alignment as agreed with @carlescufi. @tejlmand, please rereview. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approving and merging with the understanding that this will be reworked later:
https://nordicsemi.atlassian.net/browse/NCSDK-27610
Introduced regression with test: https://github.com/nrfconnect/sdk-nrf/blob/main/tests/subsys/bootloader/bl_storage/testcase.yaml Instead of I see that it is because of setting |
and maybe better to change extension in |
Adds a dfu_application.zip output file which contains the update bin files when secure boot is used without MCUboot being enabled