bugfix: esp32s3: allows QIO flash mode

Allows QIO flash mode on esp32s3 Fixes #73677 Signed-off-by: Marcio Ribeiro <marcio.ribeiro@espressif.com>
zephyrproject-rtos · Sep 12, 2024 · 65ebea6 · 65ebea6
1 parent a79e607
commit 65ebea6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/components/bootloader_support/src/bootloader_init.c b/components/bootloader_support/src/bootloader_init.c
@@ -29,13 +29,17 @@ 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 */
     if (bootloader_flash_read(ESP_BOOTLOADER_OFFSET, &bootloader_image_hdr, sizeof(esp_image_header_t), true) != ESP_OK) {
         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/components/bootloader_support/src/esp32s3/bootloader_esp32s3.c b/components/bootloader_support/src/esp32s3/bootloader_esp32s3.c
@@ -182,6 +182,7 @@ esp_err_t bootloader_init(void)
     bootloader_print_banner();
 
 #ifdef CONFIG_ESP_SIMPLE_BOOT
+    spi_flash_init_chip_state();
     esp_flash_init_default_chip();
 #endif
 

diff --git a/zephyr/esp32s3/CMakeLists.txt b/zephyr/esp32s3/CMakeLists.txt
@@ -147,7 +147,7 @@ if(CONFIG_SOC_SERIES_ESP32S3)
     ../../components/spi_flash/spi_flash_chip_winbond.c
     ../../components/spi_flash/spi_flash_hpm_enable.c
     ../../components/spi_flash/spi_flash_os_func_noos.c
-    # todo: ../../components/spi_flash/spi_flash_wrap.c
+    ../../components/spi_flash/spi_flash_wrap.c
     )
   endif()