mcuboot: build MCUboot Espressif Port with Zephyr sysbuild #424
+71
−114
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
almir-okato
requested review from
LucasTambor,
marekmatej,
raffarost,
sylvioalves and
wmrsouza
as code owners
almir-okato
force-pushed
the
mcuboot_espressif_port_integration
branch
3 times, most recently
from
8bffaa0 to
25c3072
Compare
marekmatej
reviewed
Mar 20, 2025
| @@ -25,8 +25,9 @@ | |||
| #include "esp32s3/rom/usb/cdc_acm.h" | |||
| #include "esp32s3/rom/usb/usb_persist.h" | |||
| #endif | |||
| #ifndef CONFIG_MCUBOOT_ESPRESSIF | |||
There was a problem hiding this comment.
isn't it less complicated to provide empty stubs.h?
marekmatej
reviewed
Mar 21, 2025
| @@ -38,7 +40,9 @@ extern "C" { | |||
| /* The md5sum value is found this many bytes after the ESP_PARTITION_MAGIC_MD5 offset */ | |||
| #define ESP_PARTITION_MD5_OFFSET 16 | |||
|
|
|||
| #ifndef CONFIG_MCUBOOT_ESPRESSIF | |||
There was a problem hiding this comment.
can we replace this with more generic define, for example #ifndef __ZEPHYR__ ?
Both bootloader_console_loader.c and bootloader_random.c are now unused when building MCUboot or App with simple boot. Signed-off-by: Almir Okato <[email protected]>
As the modified files are not used when building MCUboot or app with simple boot anymore, the patches are being undone. Signed-off-by: Almir Okato <[email protected]>
Skip building the hal sources from zephyr/<SOC>/CMakeLists.txt when building MCUboot Espressif port from Zephyr's sysbuild as it already have it's own way for integrating the Espressif hal. Change ESP_LOG for ESP_EARLY_LOG on bootloader files used by MCUboot Espressif port. Signed-off-by: Lucas Tamborrino <[email protected]> Signed-off-by: Almir Okato <[email protected]>
almir-okato
force-pushed
the
mcuboot_espressif_port_integration
branch
from
25c3072 to
de837d1
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These changes were made to skip building the hal sources from zephyr//CMakeLists.txt when building MCUboot Espressif port from Zephyr's sysbuild as it already have it's own way for integrating the Espressif hal.
This PR is needed for the MCUboot Espressif Port integration with Zephyr's sysbuild (PRs to be opened in both MCUboot and Zephyr repositories).