diff --git a/boards/4d_systems_esp32s3_gen4_r8n16.json b/boards/4d_systems_esp32s3_gen4_r8n16.json
index 4418be557..753980a74 100644
--- a/boards/4d_systems_esp32s3_gen4_r8n16.json
+++ b/boards/4d_systems_esp32s3_gen4_r8n16.json
@@ -1,9 +1,8 @@
 {
   "build": {
     "arduino": {
-      "ldscript": "esp32s3_out.ld",
       "memory_type": "qio_opi",
-      "partitions": "default_16MB.csv"
+      "partitions": "esp_sr_16.csv"
     },
     "core": "esp32",
     "extra_flags": [
diff --git a/boards/esp32-c2-devkitm-1.json b/boards/esp32-c2-devkitm-1.json
new file mode 100644
index 000000000..eb3a58c50
--- /dev/null
+++ b/boards/esp32-c2-devkitm-1.json
@@ -0,0 +1,30 @@
+{
+  "build": {
+    "core": "esp32",
+    "f_cpu": "120000000L",
+    "f_flash": "60000000L",
+    "flash_mode": "qio",
+    "mcu": "esp32c2",
+    "variant": "esp32c2"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32c2.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Espressif ESP32-C2-DevKitM-1",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 278528,
+    "maximum_size": 4194304,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://docs.espressif.com/projects/espressif-esp-dev-kits/en/latest/esp8684/esp8684-devkitm-1/user_guide.html",
+  "vendor": "Espressif"
+}
diff --git a/boards/esp32-c6-devkitc-1.json b/boards/esp32-c6-devkitc-1.json
index 18a76dcc7..b82e07f8d 100644
--- a/boards/esp32-c6-devkitc-1.json
+++ b/boards/esp32-c6-devkitc-1.json
@@ -4,12 +4,17 @@
     "f_cpu": "160000000L",
     "f_flash": "80000000L",
     "flash_mode": "qio",
-    "mcu": "esp32c6"
+    "mcu": "esp32c6",
+    "variant": "esp32c6"
   },
   "connectivity": [
     "wifi"
   ],
+  "debug": {
+    "openocd_target": "esp32c6.cfg"
+  },
   "frameworks": [
+    "arduino",
     "espidf"
   ],
   "name": "Espressif ESP32-C6-DevKitC-1",
diff --git a/boards/esp32-c6-devkitm-1.json b/boards/esp32-c6-devkitm-1.json
index c30687fa9..069d0d791 100644
--- a/boards/esp32-c6-devkitm-1.json
+++ b/boards/esp32-c6-devkitm-1.json
@@ -14,6 +14,7 @@
     "openocd_target": "esp32c6.cfg"
   },
   "frameworks": [
+    "arduino",
     "espidf"
   ],
   "name": "Espressif ESP32-C6-DevKitM-1",
diff --git a/boards/esp32-h2-devkitm-1.json b/boards/esp32-h2-devkitm-1.json
new file mode 100644
index 000000000..519f61b22
--- /dev/null
+++ b/boards/esp32-h2-devkitm-1.json
@@ -0,0 +1,38 @@
+{
+  "build": {
+    "core": "esp32",
+    "f_cpu": "96000000L",
+    "f_flash": "64000000L",
+    "f_image": "48000000L",
+    "flash_mode": "qio",
+    "mcu": "esp32h2",
+    "variant": "esp32h2",
+    "hwids": [
+      [
+        "0x303A",
+        "0x1001"
+      ]
+    ]
+  },
+  "connectivity": [
+    "bluetooth",
+    "zigbee"
+  ],
+  "debug": {
+    "openocd_target": "esp32h2.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Espressif ESP32-H2-DevKit",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://docs.espressif.com/projects/espressif-esp-dev-kits/en/latest/esp32h2/esp32-h2-devkitm-1/index.html",
+  "vendor": "Espressif"
+}
diff --git a/boards/esp32-solo1.json b/boards/esp32-solo1.json
new file mode 100644
index 000000000..e87b7e13d
--- /dev/null
+++ b/boards/esp32-solo1.json
@@ -0,0 +1,37 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "esp32_out.ld"
+    },
+    "core": "esp32",
+    "extra_flags": "-DARDUINO_ESP32_DEV -DARDUINO_USB_CDC_ON_BOOT=0 -DCORE32SOLO1",
+    "f_cpu": "80000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "dio",
+    "mcu": "esp32",
+    "variant": "esp32"
+  },
+  "connectivity": [
+    "wifi",
+    "bluetooth",
+    "ethernet",
+    "can"
+  ],
+  "debug": {
+    "openocd_target": "esp32-solo-1.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Espressif Generic ESP32-solo1 4M Flash",
+  "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": "Espressif"
+}