espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-09 07:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

draft: another patch..

Browse Source
This commit is contained in:
Michael (XIAO Xufeng)
2021-08-19 17:02:58 +08:00
parent 8dcfa1b384
commit 7649db9712
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/bootloader_support/src/bootloader_flash.c
View File

@@ -579,6 +579,7 @@ IRAM_ATTR static uint32_t bootloader_flash_execute_command_common(
assert(miso_len <= 32); assert(miso_len <= 32);
uint32_t old_ctrl_reg = SPIFLASH.ctrl.val; uint32_t old_ctrl_reg = SPIFLASH.ctrl.val;
uint32_t old_user_reg = SPIFLASH.user.val; uint32_t old_user_reg = SPIFLASH.user.val;
uint32_t old_user1_reg = SPIFLASH.user1.val;
#if CONFIG_IDF_TARGET_ESP32 #if CONFIG_IDF_TARGET_ESP32
SPIFLASH.ctrl.val = SPI_WP_REG_M; // keep WP high while idle, otherwise leave DIO mode SPIFLASH.ctrl.val = SPI_WP_REG_M; // keep WP high while idle, otherwise leave DIO mode
#else #else
@@ -626,6 +627,7 @@ IRAM_ATTR static uint32_t bootloader_flash_execute_command_common(
} }
SPIFLASH.ctrl.val = old_ctrl_reg; SPIFLASH.ctrl.val = old_ctrl_reg;
SPIFLASH.user.val = old_user_reg; SPIFLASH.user.val = old_user_reg;
SPIFLASH.user1.val = old_user1_reg;
uint32_t ret = SPIFLASH.data_buf[0]; uint32_t ret = SPIFLASH.data_buf[0];
if (miso_len < 32) { if (miso_len < 32) {