tcl/esp: common esp_ftdi.cfg for all esp-ftdi targets

sobuch · erhankur · commit 50fe5b65c334 · 2025-02-14T23:18:46.000+08:00
diff --git a/tcl/board/esp32-ethernet-kit-3.3v.cfg b/tcl/board/esp32-ethernet-kit-3.3v.cfg
@@ -8,7 +8,7 @@
 #
 
 # Source the JTAG interface configuration file
-source [find interface/ftdi/esp32_devkitj_v1.cfg]
+source [find interface/ftdi/esp_ftdi.cfg]
 set ESP32_FLASH_VOLTAGE 3.3
 # Source the ESP32 configuration file
 source [find target/esp32.cfg]
diff --git a/tcl/board/esp32-wrover-kit-1.8v.cfg b/tcl/board/esp32-wrover-kit-1.8v.cfg
@@ -8,7 +8,7 @@
 #
 
 # Source the JTAG interface configuration file
-source [find interface/ftdi/esp32_devkitj_v1.cfg]
+source [find interface/ftdi/esp_ftdi.cfg]
 set ESP32_FLASH_VOLTAGE 1.8
 # Source the ESP32 configuration file
 source [find target/esp32.cfg]
diff --git a/tcl/board/esp32-wrover-kit-3.3v.cfg b/tcl/board/esp32-wrover-kit-3.3v.cfg
@@ -8,7 +8,7 @@
 #
 
 # Source the JTAG interface configuration file
-source [find interface/ftdi/esp32_devkitj_v1.cfg]
+source [find interface/ftdi/esp_ftdi.cfg]
 set ESP32_FLASH_VOLTAGE 3.3
 # Source the ESP32 configuration file
 source [find target/esp32.cfg]
diff --git a/tcl/board/esp32c2-ftdi.cfg b/tcl/board/esp32c2-ftdi.cfg
@@ -8,6 +8,6 @@
 #
 
 # Source the JTAG interface configuration file
-source [find interface/ftdi/esp32_devkitj_v1.cfg]
+source [find interface/ftdi/esp_ftdi.cfg]
 # Source the ESP32-C2 configuration file
 source [find target/esp32c2.cfg]
diff --git a/tcl/board/esp32c3-ftdi.cfg b/tcl/board/esp32c3-ftdi.cfg
@@ -8,6 +8,6 @@
 #
 
 # Source the JTAG interface configuration file
-source [find interface/ftdi/esp32_devkitj_v1.cfg]
+source [find interface/ftdi/esp_ftdi.cfg]
 # Source the ESP32-C3 configuration file
 source [find target/esp32c3.cfg]
diff --git a/tcl/board/esp32c5-ftdi.cfg b/tcl/board/esp32c5-ftdi.cfg
@@ -8,6 +8,6 @@
 #
 
 # Source the JTAG interface configuration file
-source [find interface/ftdi/esp32_devkitj_v1.cfg]
+source [find interface/ftdi/esp_ftdi.cfg]
 # Source the ESP32-C5 configuration file
 source [find target/esp32c5.cfg]
diff --git a/tcl/board/esp32c6-ftdi.cfg b/tcl/board/esp32c6-ftdi.cfg
@@ -8,6 +8,6 @@
 #
 
 # Source the JTAG interface configuration file
-source [find interface/ftdi/esp32_devkitj_v1.cfg]
+source [find interface/ftdi/esp_ftdi.cfg]
 # Source the ESP32-C6 configuration file
 source [find target/esp32c6.cfg]
diff --git a/tcl/board/esp32c6-lpcore-ftdi.cfg b/tcl/board/esp32c6-lpcore-ftdi.cfg
@@ -8,6 +8,6 @@
 #
 
 # Source the JTAG interface configuration file
-source [find interface/ftdi/esp32_devkitj_v1.cfg]
+source [find interface/ftdi/esp_ftdi.cfg]
 # Source the ESP32-C6 configuration file
 source [find target/esp32c6-lpcore.cfg]
diff --git a/tcl/board/esp32c61-ftdi.cfg b/tcl/board/esp32c61-ftdi.cfg
@@ -8,6 +8,6 @@
 #
 
 # Source the JTAG interface configuration file
-source [find interface/ftdi/esp32_devkitj_v1.cfg]
+source [find interface/ftdi/esp_ftdi.cfg]
 # Source the ESP32-C61 configuration file
 source [find target/esp32c61.cfg]
diff --git a/tcl/board/esp32h2-ftdi.cfg b/tcl/board/esp32h2-ftdi.cfg
@@ -8,6 +8,6 @@
 #
 
 # Source the JTAG interface configuration file
-source [find interface/ftdi/esp32_devkitj_v1.cfg]
+source [find interface/ftdi/esp_ftdi.cfg]
 # Source the ESP32-H2 configuration file
 source [find target/esp32h2.cfg]
diff --git a/tcl/board/esp32p4-ftdi.cfg b/tcl/board/esp32p4-ftdi.cfg
@@ -8,6 +8,6 @@
 #
 
 # Source the JTAG interface configuration file
-source [find interface/ftdi/esp32p4_ftdi.cfg]
+source [find interface/ftdi/esp_ftdi.cfg]
 # Source the ESP32-P4 configuration file
 source [find target/esp32p4.cfg]
diff --git a/tcl/board/esp32s3-ftdi.cfg b/tcl/board/esp32s3-ftdi.cfg
@@ -8,6 +8,6 @@
 #
 
 # Source the JTAG interface configuration file
-source [find interface/ftdi/esp32_devkitj_v1.cfg]
+source [find interface/ftdi/esp_ftdi.cfg]
 # Source the ESP32-S3 configuration file
 source [find target/esp32s3.cfg]
diff --git a/tcl/esp-config-schema.json b/tcl/esp-config-schema.json
@@ -80,7 +80,7 @@
                     "type": "string"
                 },
                 "config_file": {
-                    "description": "Config file of debug interface e.g. 'ftdi/esp32_devkitj_v1.cfg'. Path relative to 'interface' sub-dir.",
+                    "description": "Config file of debug interface e.g. 'ftdi/esp_ftdi.cfg'. Path relative to 'interface' sub-dir.",
                     "type": "string"
                 },
                 "command": {
diff --git a/tcl/esp-config.json b/tcl/esp-config.json
@@ -12,7 +12,7 @@
         { "id": "esp32p4", "name": "ESP32-P4", "idcode": "0x00012c25" }
     ],
     "interfaces" : [
-        { "id": "ftdi", "config_file": "ftdi/esp32_devkitj_v1.cfg", "command": "ftdi" },
+        { "id": "ftdi", "config_file": "ftdi/esp_ftdi.cfg", "command": "ftdi" },
         { "id": "esp_usb_jtag", "config_file": "esp_usb_jtag.cfg", "command": "espusbjtag" },
         { "id": "esp_usb_bridge", "config_file": "esp_usb_bridge.cfg", "command": "espusbjtag" }
     ],
@@ -44,7 +44,7 @@
             "target": "esp32",
             "interface": "ftdi",
             "config_files": [
-                "interface/ftdi/esp32_devkitj_v1.cfg",
+                "interface/ftdi/esp_ftdi.cfg",
                 "target/esp32.cfg"
             ]
         },
@@ -63,7 +63,7 @@
             "target": "esp32",
             "interface": "ftdi",
             "config_files": [
-                "interface/ftdi/esp32_devkitj_v1.cfg",
+                "interface/ftdi/esp_ftdi.cfg",
                 "target/esp32-solo-1.cfg"
             ]
         },
@@ -80,7 +80,7 @@
             "target": "esp32s2",
             "interface": "ftdi",
             "config_files": [
-                "interface/ftdi/esp32_devkitj_v1.cfg",
+                "interface/ftdi/esp_ftdi.cfg",
                 "target/esp32s2.cfg"
             ]
         },
@@ -108,7 +108,7 @@
             "target": "esp32s3",
             "interface": "ftdi",
             "config_files": [
-                "interface/ftdi/esp32_devkitj_v1.cfg",
+                "interface/ftdi/esp_ftdi.cfg",
                 "target/esp32s3.cfg"
             ]
         },
diff --git a/tcl/interface/ftdi/esp32_devkitj_v1.cfg b/tcl/interface/ftdi/esp32_devkitj_v1.cfg
@@ -3,37 +3,6 @@
 # Driver for the FT2232H JTAG chip on the Espressif DevkitJ board
 # (and most other FT2232H and FT232H based boards)
 #
-
-adapter driver ftdi
-
-ftdi vid_pid 0x0403 0x6010 0x0403 0x6014
-
-# interface 1 is the uart
-ftdi channel 0
-
-# TCK, TDI, TDO, TMS: ADBUS0-3
-# LEDs: ACBUS4-7
-
-ftdi layout_init 0x0008 0xf00b
-ftdi layout_signal LED -data 0x1000
-ftdi layout_signal LED2 -data 0x2000
-ftdi layout_signal LED3 -data 0x4000
-ftdi layout_signal LED4 -data 0x8000
-
-# Actually this should be in board config file, but we need this for board config detecting script to work.
-# That script runs OpenOCD with interface config file only, in that case FTDI
-# driver complains that transport is not selected
-transport select jtag
-
-# ESP32 series chips do not have a TRST input, and the SRST line is connected to the EN pin.
-# The target code doesn't handle SRST reset properly yet, so this is commented out:
-# ftdi layout_signal nSRST -oe 0x0020
-# reset_config srst_only
-
-# The speed of the JTAG interface, in kHz. If you get DSR/DIR errors (and they
-# do not relate to OpenOCD trying to read from a memory range without physical
-# memory being present there), you can try lowering this.
-#
-# On DevKit-J, this can go as high as 20MHz if CPU frequency is 80MHz, or 26MHz
-# if CPU frequency is 160MHz or 240MHz.
-adapter speed 20000
+echo "WARNING: interface/ftdi/esp32_devkitj_v1.cfg is deprecated, and may be removed in a future release."
+echo "         Use interface/ftdi/esp_ftdi.cfg instead."
+source [find interface/ftdi/esp_ftdi.cfg]
diff --git a/tcl/interface/ftdi/esp32p4_ftdi.cfg b/tcl/interface/ftdi/esp32p4_ftdi.cfg
@@ -3,34 +3,6 @@
 # Driver for the FT2232H JTAG chip on the Espressif DevkitJ board
 # (and most other FT2232H and FT232H based boards)
 #
-
-adapter driver ftdi
-ftdi vid_pid 0x0403 0x6010
-# 0x0403 0x6014
-
-# interface 1 is the uart
-ftdi channel 0
-
-# TCK, TDI, TDO, TMS: ADBUS0-3
-# LEDs: ACBUS4-7
-
-ftdi layout_init 0x0008 0xf00b
-ftdi layout_signal LED -data 0x1000
-ftdi layout_signal LED2 -data 0x2000
-ftdi layout_signal LED3 -data 0x4000
-ftdi layout_signal LED4 -data 0x8000
-
-ftdi tdo_sample_edge falling
-
-# ESP32 series chips do not have a TRST input, and the SRST line is connected to the EN pin.
-# The target code doesn't handle SRST reset properly yet, so this is commented out:
-# ftdi layout_signal nSRST -oe 0x0020
-# reset_config srst_only
-
-# The speed of the JTAG interface, in kHz. If you get DSR/DIR errors (and they
-# do not relate to OpenOCD trying to read from a memory range without physical
-# memory being present there), you can try lowering this.
-#
-# On DevKit-J, this can go as high as 20MHz if CPU frequency is 80MHz, or 26MHz
-# if CPU frequency is 160MHz or 240MHz.
-adapter speed 10000
+echo "WARNING: interface/ftdi/esp32p4_ftdi.cfg is deprecated, and may be removed in a future release."
+echo "         Use interface/ftdi/esp_ftdi.cfg instead."
+source [find interface/ftdi/esp_ftdi.cfg]
diff --git a/tcl/interface/ftdi/esp_ftdi.cfg b/tcl/interface/ftdi/esp_ftdi.cfg
@@ -0,0 +1,39 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Driver for the FT2232H JTAG chip on the Espressif DevkitJ board
+# (and most other FT2232H and FT232H based boards)
+#
+
+adapter driver ftdi
+
+ftdi vid_pid 0x0403 0x6010 0x0403 0x6014
+
+# interface 1 is the uart
+ftdi channel 0
+
+# TCK, TDI, TDO, TMS: ADBUS0-3
+# LEDs: ACBUS4-7
+
+ftdi layout_init 0x0008 0xf00b
+ftdi layout_signal LED -data 0x1000
+ftdi layout_signal LED2 -data 0x2000
+ftdi layout_signal LED3 -data 0x4000
+ftdi layout_signal LED4 -data 0x8000
+
+# Actually this should be in board config file, but we need this for board config detecting script to work.
+# That script runs OpenOCD with interface config file only, in that case FTDI
+# driver complains that transport is not selected
+transport select jtag
+
+# ESP32 series chips do not have a TRST input, and the SRST line is connected to the EN pin.
+# The target code doesn't handle SRST reset properly yet, so this is commented out:
+# ftdi layout_signal nSRST -oe 0x0020
+# reset_config srst_only
+
+# The speed of the JTAG interface, in kHz. If you get DSR/DIR errors (and they
+# do not relate to OpenOCD trying to read from a memory range without physical
+# memory being present there), you can try lowering this.
+#
+# On DevKit-J, this can go as high as 20MHz if CPU frequency is 80MHz, or 26MHz
+# if CPU frequency is 160MHz or 240MHz.
+adapter speed 20000
diff --git a/testing/esp/run_tests.py b/testing/esp/run_tests.py
@@ -35,7 +35,7 @@
     },
     'esp32-solo-devkitj' :  {
         'files' : [
-            os.path.join('interface', 'ftdi', 'esp32_devkitj_v1.cfg'),
+            os.path.join('interface', 'ftdi', 'esp_ftdi.cfg'),
             os.path.join('target', 'esp32-solo-1.cfg')
         ],
         'commands' : [],
@@ -44,7 +44,7 @@
     },
     'esp32s2-devkitj' :  {
         'files' : [
-            os.path.join('interface', 'ftdi', 'esp32_devkitj_v1.cfg'),
+            os.path.join('interface', 'ftdi', 'esp_ftdi.cfg'),
             os.path.join('target', 'esp32s2.cfg')
         ],
         'commands' : [],

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`#`
`9`	`9`
`10`	`10`	`# Source the JTAG interface configuration file`
`11`		`-source [find interface/ftdi/esp32_devkitj_v1.cfg]`
	`11`	`+source [find interface/ftdi/esp_ftdi.cfg]`
`12`	`12`	`set ESP32_FLASH_VOLTAGE 3.3`
`13`	`13`	`# Source the ESP32 configuration file`
`14`	`14`	`source [find target/esp32.cfg]`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@`
`8`	`8`	`#`
`9`	`9`
`10`	`10`	`# Source the JTAG interface configuration file`
`11`		`-source [find interface/ftdi/esp32_devkitj_v1.cfg]`
	`11`	`+source [find interface/ftdi/esp_ftdi.cfg]`
`12`	`12`	`# Source the ESP32-C2 configuration file`
`13`	`13`	`source [find target/esp32c2.cfg]`