tcl: Adapt config files to new usb_blaster command syntax

Change-Id: I4eb645f74ef31fc0b5882299b3487020aa142dd8
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: http://openocd.zylin.com/6408
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>

diff --git a/tcl/board/altera_sockit.cfg b/tcl/board/altera_sockit.cfg
index b7c7993fe14787b60936134028f6d4988fa424c1..4d10aef7b132c1477e780072906153a27556af19 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 0x09fb 0x6810
-#usb_blaster_device_desc "USB-Blaster II"
+#usb_blaster vid_pid 0x09fb 0x6810
+#usb_blaster device_desc "USB-Blaster II"
 
 adapter speed 100

diff --git a/tcl/board/reflexces_achilles_i-dev_kit_arria10.cfg b/tcl/board/reflexces_achilles_i-dev_kit_arria10.cfg
index a6e80650ede832b990dbd82240e86304754a3f42..c9f8d36959ca4a54588cf17ea7ba43582ecde6b2 100644 (file)
--- a/tcl/board/reflexces_achilles_i-dev_kit_arria10.cfg
+++ b/tcl/board/reflexces_achilles_i-dev_kit_arria10.cfg
@@ -6,7 +6,7 @@ if { [info exists USE_EXTERNAL_DEBUGGER] } {
        echo "Using external debugger"
 } else {
        source [find interface/altera-usb-blaster2.cfg]
-       usb_blaster_device_desc "Arria10 IDK"
+       usb_blaster device_desc "Arria10 IDK"
 }
 
 source [find fpga/altera-10m50.cfg]

diff --git a/tcl/interface/altera-usb-blaster.cfg b/tcl/interface/altera-usb-blaster.cfg
index 84e77b13ce7faea50a82bf13567dc8f097408bd3..cb4ca9a785c56c8e884a83a38689e3e0eaed0ff4 100644 (file)
--- a/tcl/interface/altera-usb-blaster.cfg
+++ b/tcl/interface/altera-usb-blaster.cfg
@@ -5,7 +5,7 @@
 #
 
 adapter driver usb_blaster
-usb_blaster_lowlevel_driver ftdi
+usb_blaster lowlevel_driver ftdi
 # These are already the defaults.
-# usb_blaster_vid_pid 0x09FB 0x6001
-# usb_blaster_device_desc "USB-Blaster"
+# usb_blaster vid_pid 0x09FB 0x6001
+# usb_blaster device_desc "USB-Blaster"

diff --git a/tcl/interface/altera-usb-blaster2.cfg b/tcl/interface/altera-usb-blaster2.cfg
index 4642b1dcfc88b46f64d6bf7f5622eef12aef08ec..05b0519b80dc162d4def9da1c0d2519c51264821 100644 (file)
--- a/tcl/interface/altera-usb-blaster2.cfg
+++ b/tcl/interface/altera-usb-blaster2.cfg
@@ -3,6 +3,6 @@
 #
 
 adapter driver usb_blaster
-usb_blaster_vid_pid 0x09fb 0x6010 0x09fb 0x6810
-usb_blaster_lowlevel_driver ublast2
-usb_blaster_firmware /path/to/quartus/blaster_6810.hex
+usb_blaster vid_pid 0x09fb 0x6010 0x09fb 0x6810
+usb_blaster lowlevel_driver ublast2
+usb_blaster firmware /path/to/quartus/blaster_6810.hex

diff --git a/tcl/interface/usb-jtag.cfg b/tcl/interface/usb-jtag.cfg
index 8617c78c360bb840a4df140f1dc5a97ee2240e4c..bbfb076d1b52c5947ca8755e0020be823ec8006d 100644 (file)
--- a/tcl/interface/usb-jtag.cfg
+++ b/tcl/interface/usb-jtag.cfg
@@ -30,8 +30,8 @@
 # driver but ixo-usb-jtag requires the ftdi driver.
 
 adapter driver usb_blaster
-usb_blaster_vid_pid 0x16C0 0x06AD
-usb_blaster_device_desc "Van Ooijen Technische Informatica"
+usb_blaster vid_pid 0x16C0 0x06AD
+usb_blaster device_desc "Van Ooijen Technische Informatica"
 # ixo-usb-jtag is only compatible with the ublast1 protocol implemented via the
 # ftdi modes, using ublast2 will cause openocd to hang.
-usb_blaster_lowlevel_driver ftdi
+usb_blaster lowlevel_driver ftdi