More fixes to create_programmer for both atlys and opsis boards.

timvideos · Nov 1, 2015 · 68e1fb7 · 68e1fb7
1 parent 1d8dc77
commit 68e1fb7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/platforms/atlys.py b/platforms/atlys.py
@@ -2,7 +2,14 @@
 
 from mibuild.generic_platform import *
 from mibuild.xilinx import XilinxPlatform
-from mibuild.xilinx import XC3SProg, iMPACT, Adept, UrJTAG
+
+from mibuild.openocd import OpenOCD
+# Alternative programmers
+from mibuild.xilinx import Adept
+from mibuild.xilinx import UrJTAG
+from mibuild.xilinx import XC3SProg
+from mibuild.xilinx import iMPACT
+
 
 # There appear to be 4 x LTC2481C on the U1-SCL / U1-SDA lines connected to the Cypress
 
@@ -580,7 +587,11 @@ def __init__(self, programmer="xc3sprog"):
         self.add_platform_command("""CONFIG VCCAUX="2.5";""")
 
     def create_programmer(self):
-        if self.programmer == "xc3sprog":
+	# Preferred programmer - Needs ixo-usb-jtag and latest openocd.
+        if self.programmer == "openocd":
+            return OpenOCD(config="board/digilent_atlys.cfg")
+	# Alternative programmers - not regularly tested.
+        elif self.programmer == "xc3sprog":
             return XC3SProg("jtaghs1_fast", "bscan_spi_digilent_atlys.bit")
         elif self.programmer == "impact":
             return iMPACT()

diff --git a/platforms/opsis.py b/platforms/opsis.py
@@ -2,9 +2,10 @@
 
 from mibuild.generic_platform import *
 from mibuild.xilinx import XilinxPlatform
-from mibuild.xilinx import iMPACT
-from mibuild.xilinx import UrJTAG
+
 from mibuild.openocd import OpenOCD
+from mibuild.xilinx import UrJTAG
+from mibuild.xilinx import iMPACT
 
 _io = [
     ## FXO-HC536R - component U17
@@ -353,12 +354,14 @@ def __init__(self, programmer="openocd"):
         self.add_platform_command("""CONFIG VCCAUX="3.3";""")
 
     def create_programmer(self):
-        if self.programmer == "urjtag":
+	# Preferred programmer - Needs ixo-usb-jtag and latest openocd.
+        if self.programmer == "openocd":
+            return OpenOCD(config="board/numato_opsis.cfg")
+	# Alternative programmers - not regularly tested.
+        elif self.programmer == "urjtag":
             return UrJTAG(cable="USBBlaster")
         elif self.programmer == "impact":
             return iMPACT()
-        elif self.programmer == "openocd":
-            return OpenOCD(config="board/numato_opsis.cfg")
         else:
             raise ValueError("{} programmer is not supported".format(self.programmer))