diff --git a/boards/default/arduino_esp32/boards.json b/boards/default/arduino_esp32/boards.json
index 0d11abd6..054cebf3 100644
--- a/boards/default/arduino_esp32/boards.json
+++ b/boards/default/arduino_esp32/boards.json
@@ -4,25 +4,6 @@
         "xmlPath": "./xml/esp32.xml",
         "key": "esp32:esp32:esp32",
         "config": [
-            {
-                "key": "JTAGAdapter",
-                "label": "JTAG Adapter",
-                "messageId": "ESP32_CONFIG_MESSAGE_JTAG_ADAPTER",
-                "options": [
-                    {
-                        "key": "default",
-                        "label": "Disabled"
-                    },
-                    {
-                        "key": "external",
-                        "label": "FTDI Adapter"
-                    },
-                    {
-                        "key": "bridge",
-                        "label": "ESP USB Bridge"
-                    }
-                ]
-            },
             {
                 "key": "PSRAM",
                 "label": "PSRAM",
@@ -1276,29 +1257,6 @@
         "xmlPath": "./xml/esp32.xml",
         "key": "esp32:esp32:esp32c3",
         "config": [
-            {
-                "key": "JTAGAdapter",
-                "label": "JTAG Adapter",
-                "messageId": "ESP32_CONFIG_MESSAGE_JTAG_ADAPTER",
-                "options": [
-                    {
-                        "key": "default",
-                        "label": "Disabled"
-                    },
-                    {
-                        "key": "builtin",
-                        "label": "Integrated USB JTAG"
-                    },
-                    {
-                        "key": "external",
-                        "label": "FTDI Adapter"
-                    },
-                    {
-                        "key": "bridge",
-                        "label": "ESP USB Bridge"
-                    }
-                ]
-            },
             {
                 "key": "CDCOnBoot",
                 "label": "USB CDC On Boot",
@@ -1875,25 +1833,6 @@
         "xmlPath": "./xml/esp32.xml",
         "key": "esp32:esp32:esp32s2",
         "config": [
-            {
-                "key": "JTAGAdapter",
-                "label": "JTAG Adapter",
-                "messageId": "ESP32_CONFIG_MESSAGE_JTAG_ADAPTER",
-                "options": [
-                    {
-                        "key": "default",
-                        "label": "Disabled"
-                    },
-                    {
-                        "key": "external",
-                        "label": "FTDI Adapter"
-                    },
-                    {
-                        "key": "bridge",
-                        "label": "ESP USB Bridge"
-                    }
-                ]
-            },
             {
                 "key": "CDCOnBoot",
                 "label": "USB CDC On Boot",
@@ -2202,29 +2141,6 @@
         "xmlPath": "./xml/esp32.xml",
         "key": "esp32:esp32:esp32s3",
         "config": [
-            {
-                "key": "JTAGAdapter",
-                "label": "JTAG Adapter",
-                "messageId": "ESP32_CONFIG_MESSAGE_JTAG_ADAPTER",
-                "options": [
-                    {
-                        "key": "default",
-                        "label": "Disabled"
-                    },
-                    {
-                        "key": "builtin",
-                        "label": "Integrated USB JTAG"
-                    },
-                    {
-                        "key": "external",
-                        "label": "FTDI Adapter"
-                    },
-                    {
-                        "key": "bridge",
-                        "label": "ESP USB Bridge"
-                    }
-                ]
-            },
             {
                 "key": "PSRAM",
                 "label": "PSRAM",
diff --git a/boards/default_src/arduino_esp32/origin/boards.json b/boards/default_src/arduino_esp32/origin/boards.json
index 0d11abd6..054cebf3 100644
--- a/boards/default_src/arduino_esp32/origin/boards.json
+++ b/boards/default_src/arduino_esp32/origin/boards.json
@@ -4,25 +4,6 @@
         "xmlPath": "./xml/esp32.xml",
         "key": "esp32:esp32:esp32",
         "config": [
-            {
-                "key": "JTAGAdapter",
-                "label": "JTAG Adapter",
-                "messageId": "ESP32_CONFIG_MESSAGE_JTAG_ADAPTER",
-                "options": [
-                    {
-                        "key": "default",
-                        "label": "Disabled"
-                    },
-                    {
-                        "key": "external",
-                        "label": "FTDI Adapter"
-                    },
-                    {
-                        "key": "bridge",
-                        "label": "ESP USB Bridge"
-                    }
-                ]
-            },
             {
                 "key": "PSRAM",
                 "label": "PSRAM",
@@ -1276,29 +1257,6 @@
         "xmlPath": "./xml/esp32.xml",
         "key": "esp32:esp32:esp32c3",
         "config": [
-            {
-                "key": "JTAGAdapter",
-                "label": "JTAG Adapter",
-                "messageId": "ESP32_CONFIG_MESSAGE_JTAG_ADAPTER",
-                "options": [
-                    {
-                        "key": "default",
-                        "label": "Disabled"
-                    },
-                    {
-                        "key": "builtin",
-                        "label": "Integrated USB JTAG"
-                    },
-                    {
-                        "key": "external",
-                        "label": "FTDI Adapter"
-                    },
-                    {
-                        "key": "bridge",
-                        "label": "ESP USB Bridge"
-                    }
-                ]
-            },
             {
                 "key": "CDCOnBoot",
                 "label": "USB CDC On Boot",
@@ -1875,25 +1833,6 @@
         "xmlPath": "./xml/esp32.xml",
         "key": "esp32:esp32:esp32s2",
         "config": [
-            {
-                "key": "JTAGAdapter",
-                "label": "JTAG Adapter",
-                "messageId": "ESP32_CONFIG_MESSAGE_JTAG_ADAPTER",
-                "options": [
-                    {
-                        "key": "default",
-                        "label": "Disabled"
-                    },
-                    {
-                        "key": "external",
-                        "label": "FTDI Adapter"
-                    },
-                    {
-                        "key": "bridge",
-                        "label": "ESP USB Bridge"
-                    }
-                ]
-            },
             {
                 "key": "CDCOnBoot",
                 "label": "USB CDC On Boot",
@@ -2202,29 +2141,6 @@
         "xmlPath": "./xml/esp32.xml",
         "key": "esp32:esp32:esp32s3",
         "config": [
-            {
-                "key": "JTAGAdapter",
-                "label": "JTAG Adapter",
-                "messageId": "ESP32_CONFIG_MESSAGE_JTAG_ADAPTER",
-                "options": [
-                    {
-                        "key": "default",
-                        "label": "Disabled"
-                    },
-                    {
-                        "key": "builtin",
-                        "label": "Integrated USB JTAG"
-                    },
-                    {
-                        "key": "external",
-                        "label": "FTDI Adapter"
-                    },
-                    {
-                        "key": "bridge",
-                        "label": "ESP USB Bridge"
-                    }
-                ]
-            },
             {
                 "key": "PSRAM",
                 "label": "PSRAM",