From e31958f4e45b223a27e86099b48eeb7c7a18aeed Mon Sep 17 00:00:00 2001 From: Marek Matej Date: Mon, 24 Nov 2025 15:32:51 +0000 Subject: [PATCH] boot: zephyr: Fix Espressif build issues Fix some issues: * correct esp32c6 overlay * remove additional new-line characters from BOOT_LOG_* macros Signed-off-by: Marek Matej --- boot/zephyr/main.c | 8 ++++---- boot/zephyr/socs/{esp32c6.conf => esp32c6_hpcore.conf} | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename boot/zephyr/socs/{esp32c6.conf => esp32c6_hpcore.conf} (100%) diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c index 1494002e7e..766ddd974e 100644 --- a/boot/zephyr/main.c +++ b/boot/zephyr/main.c @@ -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; } @@ -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) ? diff --git a/boot/zephyr/socs/esp32c6.conf b/boot/zephyr/socs/esp32c6_hpcore.conf similarity index 100% rename from boot/zephyr/socs/esp32c6.conf rename to boot/zephyr/socs/esp32c6_hpcore.conf