diff --git a/components/bootloader_support/src/bootloader_common_loader.c b/components/bootloader_support/src/bootloader_common_loader.c index a8c1ea97c0..be703f5bc0 100644 --- a/components/bootloader_support/src/bootloader_common_loader.c +++ b/components/bootloader_support/src/bootloader_common_loader.c @@ -62,7 +62,7 @@ esp_err_t bootloader_common_check_chip_validity(const esp_image_header_t* img_hd esp_err_t err = ESP_OK; esp_chip_id_t chip_id = CONFIG_IDF_FIRMWARE_CHIP_ID; if (chip_id != img_hdr->chip_id) { - ESP_LOGE(TAG, "mismatch chip ID, expected %d, found %d", chip_id, img_hdr->chip_id); + ESP_EARLY_LOGE(TAG, "mismatch chip ID, expected %d, found %d", chip_id, img_hdr->chip_id); err = ESP_FAIL; } else { #ifndef CONFIG_IDF_ENV_FPGA diff --git a/components/bootloader_support/src/bootloader_init.c b/components/bootloader_support/src/bootloader_init.c index b7398b0171..42f4ef8e4e 100644 --- a/components/bootloader_support/src/bootloader_init.c +++ b/components/bootloader_support/src/bootloader_init.c @@ -29,6 +29,7 @@ void bootloader_clear_bss_section(void) memset(&_bss_start, 0, ((unsigned*)&_bss_end - (unsigned*)&_bss_start) * sizeof(&_bss_start)); } +#include "hexdump.h" esp_err_t bootloader_read_bootloader_header(void) { /* load bootloader image header */ @@ -36,6 +37,9 @@ esp_err_t bootloader_read_bootloader_header(void) ESP_EARLY_LOGE(TAG, "failed to load bootloader image header!"); return ESP_FAIL; } + + hexdump("bootloader_image_hdr", &bootloader_image_hdr, sizeof(esp_image_header_t)); + return ESP_OK; } diff --git a/zephyr/esp32s3/CMakeLists.txt b/zephyr/esp32s3/CMakeLists.txt index 8524f6947a..8ff91ef822 100644 --- a/zephyr/esp32s3/CMakeLists.txt +++ b/zephyr/esp32s3/CMakeLists.txt @@ -149,7 +149,7 @@ if(CONFIG_SOC_SERIES_ESP32S3) ../../components/spi_flash/spi_flash_hpm_enable.c ../../components/spi_flash/spi_flash_os_func_noos.c ../../components/spi_flash/spi_flash_os_func_app.c - # todo: ../../components/spi_flash/spi_flash_wrap.c + ../../components/spi_flash/spi_flash_wrap.c ) endif()