Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/improve_spi_timing_for_flash' into 'master'

Browse source 
bugfix(flash): improve spi cs timing settings for flash

See merge request espressif/esp-idf!4964
This commit is contained in:
Jiang Jiang Jian 2019-07-08 11:11:03 +08:00
parent 1935a5a93c d6c40c7c1d
commit 1587770cbb
4 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
components/bootloader_support/include/bootloader_common.h
View file

@ -146,6 +146,14 @@ esp_err_t bootloader_common_get_partition_description(const esp_partition_pos_t
*/ */
void bootloader_common_vddsdio_configure(); void bootloader_common_vddsdio_configure();
/**
* @brief Set the flash CS setup and hold time.
*
* CS setup time is recomemded to be 1.5T, and CS hold time is recommended to be 2.5T.
* cs_setup = 1, cs_setup_time = 0; cs_hold = 1, cs_hold_time = 1
*/
void bootloader_common_set_flash_cs_timing();
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

12
components/bootloader_support/src/bootloader_common.c
View file

@ -25,6 +25,8 @@
#include "bootloader_common.h" #include "bootloader_common.h"
#include "soc/gpio_periph.h" #include "soc/gpio_periph.h"
#include "soc/rtc.h" #include "soc/rtc.h"
#include "soc/efuse_reg.h"
#include "soc/spi_reg.h"
#include "esp_image_format.h" #include "esp_image_format.h"
#include "bootloader_sha.h" #include "bootloader_sha.h"
#include "sys/param.h" #include "sys/param.h"
@ -270,3 +272,13 @@ void bootloader_common_vddsdio_configure()
} }
#endif // CONFIG_BOOTLOADER_VDDSDIO_BOOST #endif // CONFIG_BOOTLOADER_VDDSDIO_BOOST
} }
void bootloader_common_set_flash_cs_timing()
{
SET_PERI_REG_MASK(SPI_USER_REG(0), SPI_CS_HOLD_M | SPI_CS_SETUP_M);
SET_PERI_REG_BITS(SPI_CTRL2_REG(0), SPI_HOLD_TIME_V, 1, SPI_HOLD_TIME_S);
SET_PERI_REG_BITS(SPI_CTRL2_REG(0), SPI_SETUP_TIME_V, 0, SPI_SETUP_TIME_S);
SET_PERI_REG_MASK(SPI_USER_REG(1), SPI_CS_HOLD_M | SPI_CS_SETUP_M);
SET_PERI_REG_BITS(SPI_CTRL2_REG(1), SPI_HOLD_TIME_V, 1, SPI_HOLD_TIME_S);
SET_PERI_REG_BITS(SPI_CTRL2_REG(1), SPI_SETUP_TIME_V, 0, SPI_SETUP_TIME_S);
}

3
components/bootloader_support/src/bootloader_init.c
View file

@ -394,6 +394,9 @@ static void IRAM_ATTR flash_gpio_configure(const esp_image_header_t* pfhdr)
#endif #endif
} }
} }
// improve the flash cs timing.
bootloader_common_set_flash_cs_timing();
} }
static void uart_console_configure(void) static void uart_console_configure(void)

3
components/esp32/cpu_start.c
View file

@ -71,6 +71,7 @@
#include "trax.h" #include "trax.h"
#include "esp_ota_ops.h" #include "esp_ota_ops.h"
#include "esp_efuse.h" #include "esp_efuse.h"
#include "bootloader_common.h"
#define STRINGIFY(s) STRINGIFY2(s) #define STRINGIFY(s) STRINGIFY2(s)
#define STRINGIFY2(s) #s #define STRINGIFY2(s) #s
@ -172,6 +173,8 @@ void IRAM_ATTR call_start_cpu0()
abort(); abort();
#endif #endif
} }
# else // If psram is uninitialized, we need to improve the flash cs timing.
bootloader_common_set_flash_cs_timing();
#endif #endif
ESP_EARLY_LOGI(TAG, "Pro cpu up."); ESP_EARLY_LOGI(TAG, "Pro cpu up.");