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
This commit is contained in:
Jiang Jiang Jian 2023-07-05 12:24:04 +08:00
commit cbcddc8ed0

View File

@ -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