diff --git a/boards/adafruit_feather_esp32s2_tft.json b/boards/adafruit_feather_esp32s2_tft.json
index 6f141b0..aee4431 100644
--- a/boards/adafruit_feather_esp32s2_tft.json
+++ b/boards/adafruit_feather_esp32s2_tft.json
@@ -1,7 +1,8 @@
 {
   "build": {
     "arduino": {
-      "ldscript": "esp32s2_out.ld"
+      "ldscript": "esp32s2_out.ld",
+      "partitions": "partitions-4MB-tinyuf2.csv"
     },
     "core": "esp32",
     "extra_flags": [
@@ -41,14 +42,6 @@
   ],
   "name": "Adafruit Feather ESP32-S2 TFT",
   "upload": {
-    "arduino": {
-      "flash_extra_images": [
-        [
-          "0x2d0000",
-          "variants/adafruit_feather_esp32s2_tft/tinyuf2.bin"
-        ]
-      ]
-    },
     "flash_size": "4MB",
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
diff --git a/boards/adafruit_feather_esp32s3.json b/boards/adafruit_feather_esp32s3.json
index 85d530a..9c14bd3 100644
--- a/boards/adafruit_feather_esp32s3.json
+++ b/boards/adafruit_feather_esp32s3.json
@@ -1,11 +1,12 @@
 {
   "build": {
     "arduino":{
-      "ldscript": "esp32s3_out.ld"
+      "ldscript": "esp32s3_out.ld",
+      "partitions": "partitions.csv"
     },
     "core": "esp32",
     "extra_flags": [
-      "-DARDUINO_ADAFRUIT_FEATHER_ESP32S3_NOPSRAM",
+      "-DARDUINO_ADAFRUIT_FEATHER_ESP32S3",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
@@ -16,19 +17,19 @@
     "hwids": [
       [
         "0x239A",
-        "0x8113"
+        "0x811B"
       ],
       [
         "0x239A",
-        "0x0113"
+        "0x011B"
       ],
       [
         "0x239A",
-        "0x8114"
+        "0x811C"
       ]
     ],
     "mcu": "esp32s3",
-    "variant": "adafruit_feather_esp32s3_nopsram"
+    "variant": "adafruit_feather_esp32s3"
   },
   "connectivity": [
     "wifi"
@@ -40,24 +41,16 @@
     "arduino",
     "espidf"
   ],
-  "name": "Adafruit Feather ESP32-S3 No PSRAM",
+  "name": "Adafruit Feather ESP32-S3 2MB PSRAM",
   "upload": {
-    "arduino": {
-      "flash_extra_images": [
-        [
-          "0x410000",
-          "variants/adafruit_feather_esp32s3_nopsram/tinyuf2.bin"
-        ]
-      ]
-    },
-    "flash_size": "8MB",
+    "flash_size": "4MB",
     "maximum_ram_size": 327680,
-    "maximum_size": 8388608,
+    "maximum_size": 4194304,
     "use_1200bps_touch": true,
     "wait_for_upload_port": true,
     "require_upload_port": true,
     "speed": 460800
   },
-  "url": "https://www.adafruit.com/product/5323",
+  "url": "https://www.adafruit.com/product/5477",
   "vendor": "Adafruit"
 }
diff --git a/boards/adafruit_feather_esp32s3_nopsram.json b/boards/adafruit_feather_esp32s3_nopsram.json
new file mode 100644
index 0000000..29541e5
--- /dev/null
+++ b/boards/adafruit_feather_esp32s3_nopsram.json
@@ -0,0 +1,63 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "esp32s3_out.ld"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_ADAFRUIT_FEATHER_ESP32S3_NOPSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [
+      [
+        "0x239A",
+        "0x811B"
+      ],
+      [
+        "0x239A",
+        "0x011B"
+      ],
+      [
+        "0x239A",
+        "0x811C"
+      ]
+    ],
+    "mcu": "esp32s3",
+    "variant": "adafruit_feather_esp32s3_nopsram"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Adafruit Feather ESP32-S3 No PSRAM",
+  "upload": {
+    "arduino": {
+      "flash_extra_images": [
+        [
+          "0x2d0000",
+          "variants/adafruit_feather_esp32s3_nopsram/tinyuf2.bin"
+        ]
+      ]
+    },
+    "flash_size": "8MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 8388608,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://www.adafruit.com/product/5323",
+  "vendor": "Adafruit"
+}
diff --git a/boards/adafruit_funhouse_esp32s2.json b/boards/adafruit_funhouse_esp32s2.json
index 9747612..eb5ee1d 100644
--- a/boards/adafruit_funhouse_esp32s2.json
+++ b/boards/adafruit_funhouse_esp32s2.json
@@ -1,7 +1,8 @@
 {
   "build": {
     "arduino":{
-      "ldscript": "esp32s2_out.ld"
+      "ldscript": "esp32s2_out.ld",
+      "partitions": "partitions-4MB-tinyuf2.csv"
     },
     "core": "esp32",
     "extra_flags": [
@@ -41,14 +42,6 @@
   ],
   "name": "Adafruit FunHouse",
   "upload": {
-    "arduino": {
-      "flash_extra_images": [
-        [
-          "0x2d0000",
-          "variants/adafruit_funhouse_esp32s2/tinyuf2.bin"
-        ]
-      ]
-    },
     "flash_size": "4MB",
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
diff --git a/boards/adafruit_magtag29_esp32s2.json b/boards/adafruit_magtag29_esp32s2.json
index 5e2dd71..fc51f61 100644
--- a/boards/adafruit_magtag29_esp32s2.json
+++ b/boards/adafruit_magtag29_esp32s2.json
@@ -1,7 +1,8 @@
 {
   "build": {
     "arduino":{
-      "ldscript": "esp32s2_out.ld"
+      "ldscript": "esp32s2_out.ld",
+      "partitions": "partitions-4MB-tinyuf2.csv"
     },
     "core": "esp32",
     "extra_flags": [
@@ -41,14 +42,6 @@
   ],
   "name": "Adafruit MagTag 2.9",
   "upload": {
-    "arduino": {
-      "flash_extra_images": [
-        [
-          "0x2d0000",
-          "variants/adafruit_magtag29_esp32s2/tinyuf2.bin"
-        ]
-      ]
-    },
     "flash_size": "4MB",
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
diff --git a/boards/adafruit_metro_esp32s2.json b/boards/adafruit_metro_esp32s2.json
index af8df22..7f75dfb 100644
--- a/boards/adafruit_metro_esp32s2.json
+++ b/boards/adafruit_metro_esp32s2.json
@@ -1,7 +1,8 @@
 {
   "build": {
     "arduino":{
-      "ldscript": "esp32s2_out.ld"
+      "ldscript": "esp32s2_out.ld",
+      "partitions": "partitions-4MB-tinyuf2.csv"
     },
     "core": "esp32",
     "extra_flags": [
@@ -41,14 +42,6 @@
   ],
   "name": "Adafruit Metro ESP32-S2",
   "upload": {
-    "arduino": {
-      "flash_extra_images": [
-        [
-          "0x2d0000",
-          "variants/adafruit_metro_esp32s2/tinyuf2.bin"
-        ]
-      ]
-    },
     "flash_size": "4MB",
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
diff --git a/boards/adafruit_qtpy_esp32s2.json b/boards/adafruit_qtpy_esp32s2.json
index 30f51dc..51beac6 100644
--- a/boards/adafruit_qtpy_esp32s2.json
+++ b/boards/adafruit_qtpy_esp32s2.json
@@ -1,7 +1,8 @@
 {
   "build": {
     "arduino": {
-      "ldscript": "esp32s2_out.ld"
+      "ldscript": "esp32s2_out.ld",
+      "partitions": "partitions-4MB-tinyuf2.csv"
     },
     "core": "esp32",
     "extra_flags": [
@@ -41,14 +42,6 @@
   ],
   "name": "Adafruit QT Py ESP32-S2",
   "upload": {
-    "arduino": {
-      "flash_extra_images": [
-        [
-          "0x2d0000",
-          "variants/adafruit_qtpy_esp32s2/tinyuf2.bin"
-        ]
-      ]
-    },
     "flash_size": "4MB",
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
diff --git a/boards/adafruit_qtpy_esp32s3.json b/boards/adafruit_qtpy_esp32s3_nopsram.json
similarity index 98%
rename from boards/adafruit_qtpy_esp32s3.json
rename to boards/adafruit_qtpy_esp32s3_nopsram.json
index 067d8a6..4412a31 100644
--- a/boards/adafruit_qtpy_esp32s3.json
+++ b/boards/adafruit_qtpy_esp32s3_nopsram.json
@@ -1,6 +1,6 @@
 {
   "build": {
-    "arduino":{
+    "arduino": {
       "ldscript": "esp32s3_out.ld"
     },
     "core": "esp32",
diff --git a/boards/atmegazero_esp32s2.json b/boards/atmegazero_esp32s2.json
index bfc4069..a23a6ce 100644
--- a/boards/atmegazero_esp32s2.json
+++ b/boards/atmegazero_esp32s2.json
@@ -1,7 +1,8 @@
 {
   "build": {
     "arduino":{
-      "ldscript": "esp32s2_out.ld"
+      "ldscript": "esp32s2_out.ld",
+      "partitions": "partitions-16MB-tinyuf2.csv"
     },
     "core": "esp32",
     "extra_flags": [
@@ -32,14 +33,6 @@
   ],
   "name": "EspinalLab ATMegaZero ESP32-S2",
   "upload": {
-    "arduino": {
-      "flash_extra_images": [
-        [
-          "0x2d0000",
-          "variants/atmegazero_esp32s2/tinyuf2.bin"
-        ]
-      ]
-    },
     "flash_size": "16MB",
     "maximum_ram_size": 327680,
     "maximum_size": 16777216,
diff --git a/boards/cnrs_aw2eth.json b/boards/cnrs_aw2eth.json
new file mode 100644
index 0000000..3669347
--- /dev/null
+++ b/boards/cnrs_aw2eth.json
@@ -0,0 +1,36 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32_out.ld"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_ESP32_PICO"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "dio",
+    "mcu": "esp32",
+    "variant": "cnrs_aw2eth"
+  },
+  "connectivity": [
+    "wifi",
+    "bluetooth",
+    "ethernet",
+    "can"
+  ],
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "CNRS AW2ETH",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://en.wikipedia.org/wiki/ESP32",
+  "vendor": "CNRS"
+}
diff --git a/boards/featheresp32-s2.json b/boards/featheresp32-s2.json
index bf6f0cb..f645bf6 100644
--- a/boards/featheresp32-s2.json
+++ b/boards/featheresp32-s2.json
@@ -1,7 +1,8 @@
 {
   "build": {
     "arduino":{
-      "ldscript": "esp32s2_out.ld"
+      "ldscript": "esp32s2_out.ld",
+      "partitions": "partitions-4MB-tinyuf2.csv"
     },
     "core": "esp32",
     "extra_flags": [
diff --git a/boards/wemos_d1_mini32.json b/boards/wemos_d1_mini32.json
index 4770623..90b1d6b 100644
--- a/boards/wemos_d1_mini32.json
+++ b/boards/wemos_d1_mini32.json
@@ -24,7 +24,7 @@
     "arduino",
     "espidf"
   ],
-  "name": "WeMos D1 MINI ESP32",
+  "name": "WEMOS D1 MINI ESP32",
   "upload": {
     "flash_size": "4MB",
     "maximum_ram_size": 327680,
diff --git a/platform.json b/platform.json
index cdff993..311c107 100644
--- a/platform.json
+++ b/platform.json
@@ -72,7 +72,7 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~3.20003.0"
+      "version": "~3.20004.0"
     },
     "framework-arduino-mbcwb": {
       "type": "framework",
diff --git a/platform.py b/platform.py
index 07b0a4c..1963baa 100644
--- a/platform.py
+++ b/platform.py
@@ -88,7 +88,9 @@ class Espressif32Platform(PlatformBase):
                         sys.exit(1)
 
         if "espidf" in frameworks:
-            # Common package for IDF and mixed Arduino+IDF projects
+            if "arduino" in frameworks:
+                self.packages["framework-arduinoespressif32"]["version"] = "~3.20003.0"
+            # Common packages for IDF and mixed Arduino+IDF projects
             for p in self.packages:
                 if p in ("tool-cmake", "tool-ninja", "toolchain-%sulp" % mcu):
                     self.packages[p]["optional"] = False