feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/esp32s3_lack_boot_resume' into 'master'

Browse Source 
bugfix(spi_flash): Add flash resuem in bootloader on esp32s3

See merge request espressif/esp-idf!25163
This commit is contained in:
C.S.M
2023-08-04 11:24:56 +08:00
parent 8e5aebe69e 91ad084c15
commit 40532cb820
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s3.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -256,6 +256,12 @@ static void IRAM_ATTR bootloader_init_flash_configure(void)
bootloader_flash_cs_timing_config(); bootloader_flash_cs_timing_config();
} }
static void bootloader_spi_flash_resume(void)
{
bootloader_execute_flash_command(CMD_RESUME, 0, 0, 0);
esp_rom_spiflash_wait_idle(&g_rom_flashchip);
}
esp_err_t bootloader_init_spi_flash(void) esp_err_t bootloader_init_spi_flash(void)
{ {
bootloader_init_flash_configure(); bootloader_init_flash_configure();
@@ -272,6 +278,7 @@ esp_err_t bootloader_init_spi_flash(void)
bootloader_spi_flash_reset(); bootloader_spi_flash_reset();
#endif #endif
bootloader_spi_flash_resume();
bootloader_flash_unlock(); bootloader_flash_unlock();
#if CONFIG_ESPTOOLPY_FLASHMODE_QIO || CONFIG_ESPTOOLPY_FLASHMODE_QOUT #if CONFIG_ESPTOOLPY_FLASHMODE_QIO || CONFIG_ESPTOOLPY_FLASHMODE_QOUT