Merge branch 'bugfix/esp32_pico_v3_2_chip_info' into 'master'

ESP-Marius · ESP-Marius · commit 266229ea34f0 · 2023-04-25T11:53:38.000+08:00
system: fix esp32 chip info not listing esp32 pico v3-02 as having embedded spiram

Closes IDFGH-9938

See merge request espressif/esp-idf!23383
diff --git a/components/esp_hw_support/port/esp32/chip_info.c b/components/esp_hw_support/port/esp32/chip_info.c
@@ -35,7 +35,8 @@ void esp_chip_info(esp_chip_info_t* out_info)
         package == EFUSE_RD_CHIP_VER_PKG_ESP32PICOV302) {
         out_info->features |= CHIP_FEATURE_EMB_FLASH;
     }
-    if(package == EFUSE_RD_CHIP_VER_PKG_ESP32D0WDR2V3) {
+    if(package == EFUSE_RD_CHIP_VER_PKG_ESP32D0WDR2V3 ||
+       package == EFUSE_RD_CHIP_VER_PKG_ESP32PICOV302) {
         out_info->features |= CHIP_FEATURE_EMB_PSRAM;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@ void esp_chip_info(esp_chip_info_t* out_info)`
`35`	`35`	`package == EFUSE_RD_CHIP_VER_PKG_ESP32PICOV302) {`
`36`	`36`	`out_info->features \|= CHIP_FEATURE_EMB_FLASH;`
`37`	`37`	`}`
`38`		`- if(package == EFUSE_RD_CHIP_VER_PKG_ESP32D0WDR2V3) {`
	`38`	`+ if(package == EFUSE_RD_CHIP_VER_PKG_ESP32D0WDR2V3 \|\|`
	`39`	`+ package == EFUSE_RD_CHIP_VER_PKG_ESP32PICOV302) {`
`39`	`40`	`out_info->features \|= CHIP_FEATURE_EMB_PSRAM;`
`40`	`41`	`}`
`41`	`42`	`}`