diff --git a/boards/esp32cam.json b/boards/esp32cam.json
new file mode 100644
index 0000000..c92f66e
--- /dev/null
+++ b/boards/esp32cam.json
@@ -0,0 +1,34 @@
+{
+  "build": {
+    "core": "esp32",
+    "extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue",
+    "f_cpu": "240000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "dio",
+    "ldscript": "esp32_out.ld",
+    "partitions": "huge_app.csv",
+    "mcu": "esp32",
+    "variant": "esp32"
+  },
+  "connectivity": [
+    "wifi",
+    "bluetooth",
+    "ethernet",
+    "can"
+  ],
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "AI Thinker ESP32-CAM",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "protocol": "esptool",
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://wiki.ai-thinker.com/esp32-cam",
+  "vendor": "AI Thinker"
+}
diff --git a/boards/frogboard.json b/boards/frogboard.json
new file mode 100644
index 0000000..976eb06
--- /dev/null
+++ b/boards/frogboard.json
@@ -0,0 +1,36 @@
+{
+  "build": {
+    "core": "esp32",
+    "extra_flags": "-DARDUINO_FROG_ESP32",
+    "f_cpu": "240000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "dio",
+    "ldscript": "esp32_out.ld",
+    "mcu": "esp32",
+    "variant": "frog32"
+  },
+  "connectivity": [
+    "wifi",
+    "bluetooth",
+    "ethernet",
+    "can"
+  ],
+  "debug": {
+    "openocd_board": "esp-wroom-32.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Frog Board ESP32",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "protocol": "esptool",
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://www.tindie.com/products/fred_IOT/esp32s-esp-wroom32-frogopins-development-board/",
+  "vendor": "Fred"
+}
diff --git a/boards/heltec_wifi_kit_32.json b/boards/heltec_wifi_kit_32.json
index 5d4db01..952cd32 100644
--- a/boards/heltec_wifi_kit_32.json
+++ b/boards/heltec_wifi_kit_32.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DARDUINO_Heltec_WIFI_Kit_32",
+    "extra_flags": "-DARDUINO_HELTEC_WIFI_KIT_32",
     "f_cpu": "240000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
@@ -19,7 +19,7 @@
     "arduino",
     "espidf"
   ],
-  "name": "Heltec WIFI Kit 32",
+  "name": "Heltec WiFi Kit 32",
   "upload": {
     "flash_size": "4MB",
     "maximum_ram_size": 327680,
@@ -28,6 +28,6 @@
     "require_upload_port": true,
     "speed": 921600
   },
-  "url": "http://www.heltec.cn",
+  "url": "http://www.heltec.cn/project/wifi-kit-32/?lang=en",
   "vendor": "Heltec Automation"
 }
diff --git a/boards/heltec_wifi_lora_32.json b/boards/heltec_wifi_lora_32.json
index f39ff1f..fb50ec9 100644
--- a/boards/heltec_wifi_lora_32.json
+++ b/boards/heltec_wifi_lora_32.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "esp32",
-    "extra_flags": "-DARDUINO_Heltec_WIFI_LoRa_32",
+    "extra_flags": "-DARDUINO_HELTEC_WIFI_LORA_32",
     "f_cpu": "240000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
@@ -22,7 +22,7 @@
     "arduino",
     "espidf"
   ],
-  "name": "Heltec WIFI LoRa 32",
+  "name": "Heltec WiFi LoRa 32",
   "upload": {
     "flash_size": "4MB",
     "maximum_ram_size": 327680,
diff --git a/boards/heltec_wifi_lora_32_V2.json b/boards/heltec_wifi_lora_32_V2.json
new file mode 100644
index 0000000..7b72aa5
--- /dev/null
+++ b/boards/heltec_wifi_lora_32_V2.json
@@ -0,0 +1,37 @@
+{
+  "build": {
+    "core": "esp32",
+    "extra_flags": "-DARDUINO_HELTEC_WIFI_LORA_32_V2",
+    "f_cpu": "240000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "dio",
+    "ldscript": "esp32_out.ld",
+    "partitions": "default_8MB.csv",
+    "mcu": "esp32",
+    "variant": "heltec_wifi_lora_32_V2"
+  },
+  "connectivity": [
+    "wifi",
+    "bluetooth",
+    "ethernet",
+    "can"
+  ],
+  "debug": {
+    "openocd_board": "esp-wroom-32.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Heltec WiFi LoRa 32 (V2)",
+  "upload": {
+    "flash_size": "8MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 8388608,
+    "protocol": "esptool",
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "http://www.heltec.cn/project/wifi-lora-32/?lang=en",
+  "vendor": "Heltec Automation"
+}
diff --git a/boards/heltec_wireless_stick.json b/boards/heltec_wireless_stick.json
new file mode 100644
index 0000000..e348705
--- /dev/null
+++ b/boards/heltec_wireless_stick.json
@@ -0,0 +1,37 @@
+{
+  "build": {
+    "core": "esp32",
+    "extra_flags": "-DARDUINO_HELTEC_WIRELESS_STICK",
+    "f_cpu": "240000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "dio",
+    "ldscript": "esp32_out.ld",
+    "partitions": "default_8MB.csv",
+    "mcu": "esp32",
+    "variant": "heltec_wireless_stick"
+  },
+  "connectivity": [
+    "wifi",
+    "bluetooth",
+    "ethernet",
+    "can"
+  ],
+  "debug": {
+    "openocd_board": "esp-wroom-32.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Heltec Wireless Stick",
+  "upload": {
+    "flash_size": "8MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 8388608,
+    "protocol": "esptool",
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "http://www.heltec.cn/project/wireless-stick/?lang=en",
+  "vendor": "Heltec Automation"
+}
diff --git a/boards/m5stick-c.json b/boards/m5stick-c.json
new file mode 100644
index 0000000..5699aea
--- /dev/null
+++ b/boards/m5stick-c.json
@@ -0,0 +1,33 @@
+{
+  "build": {
+    "core": "esp32",
+    "extra_flags": "-DARDUINO_M5Stick_C",
+    "f_cpu": "240000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "dio",
+    "ldscript": "esp32_out.ld",
+    "mcu": "esp32",
+    "variant": "m5stick_c"
+  },
+  "connectivity": [
+    "wifi",
+    "bluetooth",
+    "ethernet",
+    "can"
+  ],
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "M5Stick-C",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "protocol": "esptool",
+    "require_upload_port": true,
+    "speed": 1500000
+  },
+  "url": "http://www.m5stack.com",
+  "vendor": "M5Stack"
+}
diff --git a/boards/oroca_edubot.json b/boards/oroca_edubot.json
index 9b2e922..c54e2ef 100644
--- a/boards/oroca_edubot.json
+++ b/boards/oroca_edubot.json
@@ -6,6 +6,7 @@
     "f_flash": "40000000L",
     "flash_mode": "dio",
     "ldscript": "esp32_out.ld",
+    "partitions": "huge_app.csv",
     "mcu": "esp32",
     "variant": "oroca_edubot"
   },
diff --git a/boards/sparkfun_lora_gateway_1-channel.json b/boards/sparkfun_lora_gateway_1-channel.json
new file mode 100644
index 0000000..7494456
--- /dev/null
+++ b/boards/sparkfun_lora_gateway_1-channel.json
@@ -0,0 +1,36 @@
+{
+  "build": {
+    "core": "esp32",
+    "extra_flags": "-DARDUINO_ESP32_DEV",
+    "f_cpu": "240000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "dio",
+    "ldscript": "esp32_out.ld",
+    "mcu": "esp32",
+    "variant": "sparkfun_lora_gateway_1-channel"
+  },
+  "connectivity": [
+    "wifi",
+    "bluetooth",
+    "ethernet",
+    "can"
+  ],
+  "debug": {
+    "openocd_board": "esp-wroom-32.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "SparkFun LoRa Gateway 1-Channel",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "protocol": "esptool",
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://www.sparkfun.com/products/15006",
+  "vendor": "SparkFun"
+}