fix: Correctly detect Adesto flash size

svenschwermer · svenschwermer · commit fb55ef5d3c6b · 2025-10-13T20:29:12.000+02:00
Adesto/Atmel flash chips report their size differently than most. This
patch is equivalent to what has previously been applied to esptool with
0b56f85.
diff --git a/cores/esp8266/Esp.cpp b/cores/esp8266/Esp.cpp
@@ -289,7 +289,12 @@ uint8_t EspClass::getFlashChipVendorId(void)
 
 uint32_t EspClass::getFlashChipRealSize(void)
 {
-    return (1 << ((spi_flash_get_id() >> 16) & 0xFF));
+    uint32_t id = spi_flash_get_id();
+    if ((id & 0xFF) == SPI_FLASH_VENDOR_ATMEL) {
+        return (0x8000 << ((id >> 8) & 0x1F));
+    } else {
+        return (1 << ((id >> 16) & 0xFF));
+    }
 }
 
 uint32_t EspClass::getFlashChipSize(void)

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,12 @@ uint8_t EspClass::getFlashChipVendorId(void)`
`289`	`289`
`290`	`290`	`uint32_t EspClass::getFlashChipRealSize(void)`
`291`	`291`	`{`
`292`		`- return (1 << ((spi_flash_get_id() >> 16) & 0xFF));`
	`292`	`+ uint32_t id = spi_flash_get_id();`
	`293`	`+ if ((id & 0xFF) == SPI_FLASH_VENDOR_ATMEL) {`
	`294`	`+ return (0x8000 << ((id >> 8) & 0x1F));`
	`295`	`+ } else {`
	`296`	`+ return (1 << ((id >> 16) & 0xFF));`
	`297`	`+ }`
`293`	`298`	`}`
`294`	`299`
`295`	`300`	`uint32_t EspClass::getFlashChipSize(void)`