udev rules: add missing Altera USB Blaster devices

All Altera USB Blaster devices require a dedicated line in the
udev rules, but some USB VID/PID present in interface and board
config file is missing in udev rules.

Add the missing Altera USB Blaster devices in udev rules.
While there, fix an incorrect pair VID/PID that are reported
swapped inside a comment.

Change-Id: I2d67e90b10db99ef2638405585859c1393456f65
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/6102
Tested-by: jenkins

diff --git a/contrib/60-openocd.rules b/contrib/60-openocd.rules
index 73a81803e7681f06c6d6cbad1b0a2c4b2846290d..a3046be8f3e7fd3adeef11a2e290db6dd9f50b7c 100644 (file)
--- a/contrib/60-openocd.rules
+++ b/contrib/60-openocd.rules
@@ -121,6 +121,9 @@ ATTRS{idVendor}=="0640", ATTRS{idProduct}=="0032", MODE="660", GROUP="plugdev",
 
 # Altera USB Blaster
 ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6001", MODE="660", GROUP="plugdev", TAG+="uaccess"
+# Altera USB Blaster2
+ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6010", MODE="660", GROUP="plugdev", TAG+="uaccess"
+ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6810", MODE="660", GROUP="plugdev", TAG+="uaccess"
 
 # Amontec JTAGkey-HiSpeed
 ATTRS{idVendor}=="0fbb", ATTRS{idProduct}=="1000", MODE="660", GROUP="plugdev", TAG+="uaccess"
@@ -166,6 +169,9 @@ ATTRS{idVendor}=="15ba", ATTRS{idProduct}=="002a", MODE="660", GROUP="plugdev",
 # Olimex ARM-USB-OCD-H
 ATTRS{idVendor}=="15ba", ATTRS{idProduct}=="002b", MODE="660", GROUP="plugdev", TAG+="uaccess"
 
+# ixo-usb-jtag - Emulation of a Altera Bus Blaster I on a Cypress FX2 IC
+ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="06ad", MODE="660", GROUP="plugdev", TAG+="uaccess"
+
 # USBprog with OpenOCD firmware
 ATTRS{idVendor}=="1781", ATTRS{idProduct}=="0c63", MODE="660", GROUP="plugdev", TAG+="uaccess"
 

diff --git a/tcl/board/altera_sockit.cfg b/tcl/board/altera_sockit.cfg
index eb4c863fa7dde1d229c7c72bdf56cbf800fda016..b7c7993fe14787b60936134028f6d4988fa424c1 100644 (file)
--- a/tcl/board/altera_sockit.cfg
+++ b/tcl/board/altera_sockit.cfg
@@ -12,7 +12,7 @@ adapter driver usb_blaster
 source [find target/altera_fpgasoc.cfg]
 
 # If the USB Blaster II were supported, these settings would be needed
-#usb_blaster_vid_pid 0x6810 0x09fb
+#usb_blaster_vid_pid 0x09fb 0x6810
 #usb_blaster_device_desc "USB-Blaster II"
 
 adapter speed 100