Skip to content

boot: zephyr: Fix Espressif build issues #2561

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

Merged
nordicjm merged 1 commit into from
Dec 4, 2025
+4 −4
Merged

boot: zephyr: Fix Espressif build issues #2561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions boot/zephyr/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,13 +316,13 @@ static void copy_img_to_SRAM(int slot, unsigned int hdr_offset)
area_id = flash_area_id_from_image_slot(slot);
rc = flash_area_open(area_id, &fap);
if (rc != 0) {
BOOT_LOG_ERR("flash_area_open failed with %d\n", rc);
BOOT_LOG_ERR("flash_area_open failed with %d", rc);
goto done;
}

rc = flash_area_read(fap, hdr_offset, dst, fap->fa_size - hdr_offset);
if (rc != 0) {
BOOT_LOG_ERR("flash_area_read failed with %d\n", rc);
BOOT_LOG_ERR("flash_area_read failed with %d", rc);
goto done;
}

Expand All @@ -340,8 +340,8 @@ static void do_boot(struct boot_rsp *rsp)
void *start;
#endif /* CONFIG_SOC_FAMILY_ESPRESSIF_ESP32 */

BOOT_LOG_INF("br_image_off = 0x%x\n", rsp->br_image_off);
BOOT_LOG_INF("ih_hdr_size = 0x%x\n", rsp->br_hdr->ih_hdr_size);
BOOT_LOG_INF("br_image_off = 0x%x", rsp->br_image_off);
BOOT_LOG_INF("ih_hdr_size = 0x%x", rsp->br_hdr->ih_hdr_size);

#ifdef CONFIG_SOC_FAMILY_ESPRESSIF_ESP32
int slot = (rsp->br_image_off == IMAGE0_PRIMARY_START_ADDRESS) ?
Expand Down
0 boot/zephyr/socs/esp32c6.conf → boot/zephyr/socs/esp32c6_hpcore.conf
View file
Open in desktop
File renamed without changes.
Loading