mirror of
https://github.com/espressif/ESP8266_RTOS_SDK.git
synced 2025-10-20 05:23:44 +08:00
fix(spi_flash): Fix bootloader failed to read image data
This commit is contained in:
@@ -39,7 +39,9 @@ uint32_t spi_flash_get_id_raw(esp_rom_spiflash_chip_t *chip)
|
|||||||
{
|
{
|
||||||
uint32_t rdid = 0;
|
uint32_t rdid = 0;
|
||||||
|
|
||||||
|
#ifndef BOOTLOADER_BUILD
|
||||||
Cache_Read_Disable();
|
Cache_Read_Disable();
|
||||||
|
#endif
|
||||||
|
|
||||||
Wait_SPI_Idle(chip);
|
Wait_SPI_Idle(chip);
|
||||||
|
|
||||||
@@ -49,7 +51,9 @@ uint32_t spi_flash_get_id_raw(esp_rom_spiflash_chip_t *chip)
|
|||||||
|
|
||||||
rdid = READ_PERI_REG(PERIPHS_SPI_FLASH_C0)&0xffffff;
|
rdid = READ_PERI_REG(PERIPHS_SPI_FLASH_C0)&0xffffff;
|
||||||
|
|
||||||
|
#ifndef BOOTLOADER_BUILD
|
||||||
Cache_Read_Enable_New();
|
Cache_Read_Enable_New();
|
||||||
|
#endif
|
||||||
|
|
||||||
return rdid;
|
return rdid;
|
||||||
}
|
}
|
||||||
@@ -150,8 +154,11 @@ bool spi_user_cmd_raw(esp_rom_spiflash_chip_t *chip, spi_cmd_dir_t mode, spi_cmd
|
|||||||
{
|
{
|
||||||
int idx = 0;
|
int idx = 0;
|
||||||
|
|
||||||
|
#ifndef BOOTLOADER_BUILD
|
||||||
// Cache Disable
|
// Cache Disable
|
||||||
Cache_Read_Disable_2();
|
Cache_Read_Disable_2();
|
||||||
|
#endif
|
||||||
|
|
||||||
//wait spi idle
|
//wait spi idle
|
||||||
if((mode & SPI_RAW) == 0) {
|
if((mode & SPI_RAW) == 0) {
|
||||||
Wait_SPI_Idle(chip);
|
Wait_SPI_Idle(chip);
|
||||||
@@ -272,8 +279,11 @@ bool spi_user_cmd_raw(esp_rom_spiflash_chip_t *chip, spi_cmd_dir_t mode, spi_cmd
|
|||||||
if((mode & SPI_RAW) == 0) {
|
if((mode & SPI_RAW) == 0) {
|
||||||
Wait_SPI_Idle(chip);
|
Wait_SPI_Idle(chip);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef BOOTLOADER_BUILD
|
||||||
//enable icache
|
//enable icache
|
||||||
Cache_Read_Enable_2();
|
Cache_Read_Enable_2();
|
||||||
|
#endif
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user