This is an automated email from Gerrit.
Sebastian Pflieger (sebastian+openocd@pflieger.email) just uploaded a new patch
set to Gerrit, which you can find at http://openocd.zylin.com/6045
-- gerrit
commit ba7d165ff80db0297f62b1ea46592157cb139ac3
Author: Sebastian Pflieger <sebastian@pflieger.email>
Date: Sun Jan 31 14:51:32 2021 +0100
tcl/interface/ftdi: unify Hilscher NXHX board cfg add NXJTAG-USB support
netX SoC development board on-board JTAG interfcaes differ only in
VID:PID and device description string
Change-Id: I5400190bcebbce33446c855bed9591cffabe1a1d
Signed-off-by: Sebastian Pflieger <sebastian@pflieger.email>
diff --git a/README b/README
index fb3051f..eff27c9 100644
--- a/README
+++ b/README
@@ -107,9 +107,9 @@ Cypress KitProg, DENX, Digilent JTAG-SMT2, DLC 5,
DLP-USB1232H,
embedded projects, eStick, FlashLINK, FlossJTAG, Flyswatter, Flyswatter2,
FTDI FT232R, Gateworks, Hoegl, ICDI, ICEBear, J-Link, JTAG VPI, JTAGkey,
JTAGkey2, JTAG-lock-pick, KT-Link, Linux GPIOD, Lisa/L, LPC1768-Stick,
-Mellanox rshim, MiniModule, NGX, Nuvoton Nu-Link, Nu-Link2, NXHX, NXP IMX GPIO,
-OOCDLink, Opendous, OpenJTAG, Openmoko, OpenRD, OSBDM, Presto, Redbee,
-Remote Bitbang, RLink, SheevaPlug devkit, Stellaris evkits,
+Mellanox rshim, MiniModule, NGX, Nuvoton Nu-Link, Nu-Link2, NXHX, NXJTAG-USB,
+NXP IMX GPIO, OOCDLink, Opendous, OpenJTAG, Openmoko, OpenRD, OSBDM, Presto,
+Redbee, Remote Bitbang, RLink, SheevaPlug devkit, Stellaris evkits,
ST-LINK (SWO tracing supported), STM32-PerformanceStick, STR9-comStick,
sysfsgpio, TI XDS110, TUMPA, Turtelizer, ULINK, USB-A9260, USB-Blaster,
USB-JTAG, USBprog, VPACLink, VSLLink, Wiggler, XDS100v2, Xilinx XVC/PCIe,
diff --git a/contrib/60-openocd.rules b/contrib/60-openocd.rules
index e0864b8..00a2d18 100644
--- a/contrib/60-openocd.rules
+++ b/contrib/60-openocd.rules
@@ -90,7 +90,7 @@ ATTRS{idVendor}=="04b4", ATTRS{idProduct}=="f139",
MODE="660", GROUP="plugdev",
# Cypress KitProg in CMSIS-DAP mode
ATTRS{idVendor}=="04b4", ATTRS{idProduct}=="f138", MODE="660",
GROUP="plugdev", TAG+="uaccess"
-# Hilscher NXHX Boards
+# Hilscher pre netX 90 NXHX Boards with Hitex vendor ID
ATTRS{idVendor}=="0640", ATTRS{idProduct}=="0028", MODE="660",
GROUP="plugdev", TAG+="uaccess"
# Hitex STR9-comStick
@@ -149,6 +149,14 @@ ATTRS{idVendor}=="15ba", ATTRS{idProduct}=="002b",
MODE="660", GROUP="plugdev",
# USBprog with OpenOCD firmware
ATTRS{idVendor}=="1781", ATTRS{idProduct}=="0c63", MODE="660",
GROUP="plugdev", TAG+="uaccess"
+# Hilscher NXJTAG-USB and NXHX on-board debugger
+ATTRS{idVendor}=="1939", ATTRS{idProduct}=="0023", MODE="660",
GROUP="plugdev", TAG+="uaccess"
+ATTRS{idVendor}=="1939", ATTRS{idProduct}=="0029", MODE="660",
GROUP="plugdev", TAG+="uaccess"
+ATTRS{idVendor}=="1939", ATTRS{idProduct}=="002c", MODE="660",
GROUP="plugdev", TAG+="uaccess"
+ATTRS{idVendor}=="1939", ATTRS{idProduct}=="0031", MODE="660",
GROUP="plugdev", TAG+="uaccess"
+# blacklist all Hilscher devices for ModemManager
+ATTRS{idVendor}=="1939", ENV{ID_MM_TTY_BLACKLIST}="1"
+
# TI/Luminary Stellaris In-Circuit Debug Interface (ICDI) Board
ATTRS{idVendor}=="1cbe", ATTRS{idProduct}=="00fd", MODE="660",
GROUP="plugdev", TAG+="uaccess"
diff --git a/tcl/interface/ftdi/hilscher_nxhx.cfg
b/tcl/interface/ftdi/hilscher_nxhx.cfg
new file mode 100644
index 0000000..6d7f4b6
--- /dev/null
+++ b/tcl/interface/ftdi/hilscher_nxhx.cfg
@@ -0,0 +1,32 @@
+#
+# Hilscher NXHX netX 10, 50, 51, 52, 500 development boards use the
+# Hitex USB Vendor ID. Starting with the NXHX 90-JATG (netX 90)
+# Hilscher started to use their own USB Vendor ID.
+#
+# Note: The NXJTAG-4000-USB is not compatible with this configuration
+
+adapter driver ftdi
+ftdi_vid_pid 0x0640 0x0028 0x1939 0x002c 0x1939 0x0029 0x1939 0x0023 0x1939
0x0031
+#ftdi_device_desc "NXHX 10-ETM"
+#ftdi_device_desc "NXHX 500-ETM"
+#ftdi_device_desc "NXHX 500-RE"
+#ftdi_device_desc "NXHX 50-ETM"
+#ftdi_device_desc "NXHX50-RE"
+#ftdi_device_desc "NXHX 51-ETM"
+#ftdi_device_desc "NXHX 90-JTAG"
+#ftdi_device_desc "NRPEB H90-RE"
+#ftdi_device_desc "NXJTAG-USB"
+#ftdi_device_desc "NXHX 90-DRIVE"
+
+# channel 0 is used for JTAG
+ftdi_channel 0
+
+# channel 1 is often connected to one of the UARTs or pins where the UART can
be muliplexed to
+# NXHX 50-ETM board to UART1
+# NXHX 51-ETM to MMIO09 to MMIO11 and MMIO20 (shared with JTAG DBGACK on ETM
connector)
+# NXHX 90-JTAG to UART0 (dependend on switch S701 configuration)
+
+ftdi_layout_init 0x0308 0x030b
+# direct connection without buffer.
+ftdi_layout_signal nTRST -data 0x0100 -oe 0x0100
+ftdi_layout_signal nSRST -data 0x0200 -oe 0x0200
diff --git a/tcl/interface/ftdi/hilscher_nxhx10_etm.cfg
b/tcl/interface/ftdi/hilscher_nxhx10_etm.cfg
deleted file mode 100644
index 3802f6d..0000000
--- a/tcl/interface/ftdi/hilscher_nxhx10_etm.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Hilscher NXHX 10-ETM
-#
-# http://de.hilscher.com/products_details_hardware.html?p_id=P_4ce145a5983e6
-#
-
-echo "WARNING!"
-echo "This file was not tested with real interface, it is based on code in
ft2232.c."
-echo "Please report your experience with this file to openocd-devel mailing
list,"
-echo "so it could be marked as working or fixed."
-
-adapter driver ftdi
-ftdi_device_desc "NXHX 10-ETM"
-ftdi_vid_pid 0x0640 0x0028
-
-ftdi_layout_init 0x0308 0x030b
-ftdi_layout_signal nTRST -data 0x0100
-ftdi_layout_signal nSRST -data 0x0200
diff --git a/tcl/interface/ftdi/hilscher_nxhx500_etm.cfg
b/tcl/interface/ftdi/hilscher_nxhx500_etm.cfg
deleted file mode 100644
index f2e64b4..0000000
--- a/tcl/interface/ftdi/hilscher_nxhx500_etm.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Hilscher NXHX 500-ETM
-#
-# http://de.hilscher.com/files_design/8/NXHX500-ETM_description_Rev01_EN.pdf
-#
-
-echo "WARNING!"
-echo "This file was not tested with real interface, it is based on code in
ft2232.c."
-echo "Please report your experience with this file to openocd-devel mailing
list,"
-echo "so it could be marked as working or fixed."
-
-adapter driver ftdi
-ftdi_device_desc "NXHX 500-ETM"
-ftdi_vid_pid 0x0640 0x0028
-
-ftdi_layout_init 0x0308 0x030b
-ftdi_layout_signal nTRST -data 0x0100
-ftdi_layout_signal nSRST -data 0x0200
diff --git a/tcl/interface/ftdi/hilscher_nxhx500_re.cfg
b/tcl/interface/ftdi/hilscher_nxhx500_re.cfg
deleted file mode 100644
index 38f3c69..0000000
--- a/tcl/interface/ftdi/hilscher_nxhx500_re.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Hilscher NXHX 500-RE
-#
-#
http://de.hilscher.com/products_details_hardware.html?p_id=P_461ff2053bad1&bs=20
-#
-
-echo "WARNING!"
-echo "This file was not tested with real interface, it is based on code in
ft2232.c."
-echo "Please report your experience with this file to openocd-devel mailing
list,"
-echo "so it could be marked as working or fixed."
-
-adapter driver ftdi
-ftdi_device_desc "NXHX 500-RE"
-ftdi_vid_pid 0x0640 0x0028
-
-ftdi_layout_init 0x0308 0x030b
-ftdi_layout_signal nTRST -data 0x0100
-ftdi_layout_signal nSRST -data 0x0200
diff --git a/tcl/interface/ftdi/hilscher_nxhx50_etm.cfg
b/tcl/interface/ftdi/hilscher_nxhx50_etm.cfg
deleted file mode 100644
index bff081f..0000000
--- a/tcl/interface/ftdi/hilscher_nxhx50_etm.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Hilscher NXHX 50-ETM
-#
-# http://de.hilscher.com/files_design/8/NXHX50-ETM_description_Rev01_EN.pdf
-#
-
-echo "WARNING!"
-echo "This file was not tested with real interface, it is based on code in
ft2232.c."
-echo "Please report your experience with this file to openocd-devel mailing
list,"
-echo "so it could be marked as working or fixed."
-
-adapter driver ftdi
-ftdi_device_desc "NXHX 50-ETM"
-ftdi_vid_pid 0x0640 0x0028
-
-ftdi_layout_init 0x0308 0x030b
-ftdi_layout_signal nTRST -data 0x0100
-ftdi_layout_signal nSRST -data 0x0200
diff --git a/tcl/interface/ftdi/hilscher_nxhx50_re.cfg
b/tcl/interface/ftdi/hilscher_nxhx50_re.cfg
deleted file mode 100644
index f9fbd01..0000000
--- a/tcl/interface/ftdi/hilscher_nxhx50_re.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Hilscher NXHX 50-RE
-#
-#
http://de.hilscher.com/products_details_hardware.html?p_id=P_483c0f582ad36&bs=20
-#
-
-echo "WARNING!"
-echo "This file was not tested with real interface, it is based on code in
ft2232.c."
-echo "Please report your experience with this file to openocd-devel mailing
list,"
-echo "so it could be marked as working or fixed."
-
-adapter driver ftdi
-ftdi_device_desc "NXHX50-RE"
-ftdi_vid_pid 0x0640 0x0028
-
-ftdi_layout_init 0x0308 0x030b
-ftdi_layout_signal nTRST -data 0x0100
-ftdi_layout_signal nSRST -data 0x0200
--
_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel
