Merge branch 'bugfix/fix_bootloader_wrong_spi_freq_print' into 'master'

bugfix: fix esp32c6 bootloader print wrong spi speed mode See merge request espressif/esp-idf!24261
espressif · Jul 5, 2023 · cbcddc8 · cbcddc8
2 parents 0d401ae + d35ba00
commit cbcddc8
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c6.c b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c6.c
@@ -207,6 +207,12 @@ esp_err_t bootloader_init_spi_flash(void)
     bootloader_enable_qio_mode();
 #endif
 
+    // Since the workaround in IDF-6709, the spi_speed value in the bootloader header
+    // is not the real value, overwrite it.
+#if CONFIG_ESPTOOLPY_FLASHFREQ_80M
+    bootloader_image_hdr.spi_speed = ESP_IMAGE_SPI_SPEED_DIV_1;
+#endif
+
     print_flash_info(&bootloader_image_hdr);
     update_flash_config(&bootloader_image_hdr);
     //ensure the flash is write-protected