Skip to content

Commit afcca2c

Browse files
marekmatejnordicjm
authored andcommitted
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 <marek.matej@espressif.com>
1 parent d95ca5c commit afcca2c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

boot/zephyr/main.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,13 +316,13 @@ static void copy_img_to_SRAM(int slot, unsigned int hdr_offset)
316316
area_id = flash_area_id_from_image_slot(slot);
317317
rc = flash_area_open(area_id, &fap);
318318
if (rc != 0) {
319-
BOOT_LOG_ERR("flash_area_open failed with %d\n", rc);
319+
BOOT_LOG_ERR("flash_area_open failed with %d", rc);
320320
goto done;
321321
}
322322

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

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

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

346346
#ifdef CONFIG_SOC_FAMILY_ESPRESSIF_ESP32
347347
int slot = (rsp->br_image_off == IMAGE0_PRIMARY_START_ADDRESS) ?
File renamed without changes.

0 commit comments

Comments
 (0)