فهرست منبع

esp32: stop using deprecated name PICOD2 to avoid confusion

Xiao Xufeng 2 سال پیش
والد
کامیت
91fc40cfd9

+ 2 - 2
components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32.c

@@ -87,7 +87,7 @@ void IRAM_ATTR bootloader_flash_gpio_config(const esp_image_header_t* pfhdr)
     uint32_t pkg_ver = bootloader_common_get_chip_ver_pkg();
 
     if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5 ||
-        pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD2 ||
+        pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32U4WDH ||
         pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4 ||
         pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOV302) {
         // For ESP32D2WD or ESP32-PICO series,the SPI pins are already configured
@@ -201,7 +201,7 @@ void bootloader_configure_spi_pins(int drv)
     uint32_t pkg_ver = bootloader_common_get_chip_ver_pkg();
 
     if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5 ||
-        pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD2 ||
+        pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32U4WDH ||
         pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4 ||
         pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOV302) {
         // For ESP32D2WD or ESP32-PICO series,the SPI pins are already configured

+ 1 - 1
components/esp_hw_support/port/esp32/chip_info.c

@@ -30,7 +30,7 @@ void esp_chip_info(esp_chip_info_t* out_info)
     }
     uint32_t package = efuse_ll_get_chip_ver_pkg();
     if (package == EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5 ||
-        package == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD2 ||
+        package == EFUSE_RD_CHIP_VER_PKG_ESP32U4WDH ||
         package == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4 ||
         package == EFUSE_RD_CHIP_VER_PKG_ESP32PICOV302) {
         out_info->features |= CHIP_FEATURE_EMB_FLASH;

+ 1 - 1
components/esp_psram/esp32/esp_psram_impl_quad.c

@@ -846,7 +846,7 @@ esp_err_t IRAM_ATTR esp_psram_impl_enable(psram_vaddr_mode_t vaddrmode)   //psra
     } else if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4 && ESP_CHIP_REV_ABOVE(efuse_hal_chip_revision(), 300)) {
         ESP_EARLY_LOGE(TAG, "This chip is ESP32-PICO-V3. It does not support PSRAM (disable it in Kconfig)");
         abort();
-    } else if ((pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD2) || (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4)) {
+    } else if ((pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32U4WDH) || (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4)) {
         ESP_EARLY_LOGI(TAG, "This chip is ESP32-PICO");
         rtc_vddsdio_config_t cfg = rtc_vddsdio_get_config();
         if (cfg.tieh != RTC_VDDSDIO_TIEH_3_3V) {