mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

bootloader_support: fix register backup 

By storing the 'user2' register during the early init
we fix the flash access issue, which occurs in the
Zephyr/MCUboot ports for ESP32.

Signed-off-by: Marek Matej <marek.matej@espressif.com>
pull/11344/head
Marek Matej 2023-04-27 16:20:30 +02:00
rodzic 3775ce8bd8
commit d1a447f6c0
1 zmienionych plików z 2 dodań i 0 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
components/bootloader_support/bootloader_flash/src/bootloader_flash.c
Wyświetl plik

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