bootloader_support: fix min. revision error print for < C3-ECO3 revisions

This commit is contained in:
Mahavir Jain
2021-04-20 14:22:14 +05:30
parent 6403a229eb
commit d41781099a

View File

@@ -262,15 +262,15 @@ static void bootloader_super_wdt_auto_feed(void)
REG_WRITE(RTC_CNTL_SWD_WPROTECT_REG, 0); REG_WRITE(RTC_CNTL_SWD_WPROTECT_REG, 0);
} }
#if CONFIG_ESP32C3_REV_MIN < 3
static inline void bootloader_hardware_init(void) static inline void bootloader_hardware_init(void)
{ {
// This check is always included in the bootloader so it can
// print the minimum revision error message later in the boot
if (bootloader_common_get_chip_revision() < 3) { if (bootloader_common_get_chip_revision() < 3) {
REGI2C_WRITE_MASK(I2C_ULP, I2C_ULP_IR_FORCE_XPD_IPH, 1); REGI2C_WRITE_MASK(I2C_ULP, I2C_ULP_IR_FORCE_XPD_IPH, 1);
REGI2C_WRITE_MASK(I2C_BIAS, I2C_BIAS_DREG_1P1_PVT, 12); REGI2C_WRITE_MASK(I2C_BIAS, I2C_BIAS_DREG_1P1_PVT, 12);
} }
} }
#endif
static inline void bootloader_glitch_reset_disable(void) static inline void bootloader_glitch_reset_disable(void)
{ {
@@ -285,9 +285,8 @@ static inline void bootloader_glitch_reset_disable(void)
esp_err_t bootloader_init(void) esp_err_t bootloader_init(void)
{ {
esp_err_t ret = ESP_OK; esp_err_t ret = ESP_OK;
#if CONFIG_ESP32C3_REV_MIN < 3
bootloader_hardware_init(); bootloader_hardware_init();
#endif
bootloader_glitch_reset_disable(); bootloader_glitch_reset_disable();
bootloader_super_wdt_auto_feed(); bootloader_super_wdt_auto_feed();
// protect memory region // protect memory region