support for bitstream loading on Papilio Pro

diff --git a/jtag.py b/jtag.py
index 6aeaf45a1b35ede8eb70f917a105eb6a667a2937..853cf710c149733d9c9c29c57e32230990fdffed 100644 (file)
--- a/jtag.py
+++ b/jtag.py
@@ -1,11 +1,17 @@
 import subprocess
 
-def load(bitstream):
-       cmds = """cable milkymist
+cables = {
+       "mixxeo":               "milkymist",
+       "m1":                   "milkymist",
+       "papilio_pro":  "Flyswatter"
+}
+
+def load(platform_name, bitstream):
+       cmds = """cable {cable}
 detect
 pld load {bitstream}
 quit
-""".format(bitstream=bitstream)
+""".format(cable=cables[platform_name], bitstream=bitstream)
        process = subprocess.Popen("jtag", stdin=subprocess.PIPE)
        process.stdin.write(cmds.encode("ASCII"))
        process.communicate()

diff --git a/make.py b/make.py
index 403d6b5100b03b31aa367c68f0c17f154b27dc2d..1740a50e2b22d8bf41ebae2d3cdaffa68aecce0a 100755 (executable)
--- a/make.py
+++ b/make.py
@@ -92,7 +92,7 @@ def main():
                        "build/" + build_name + ".fpg"])
 
        if args.load:
-               jtag.load("build/" + build_name + ".bit")
+               jtag.load(platform.name, "build/" + build_name + ".bit")
        if args.flash:
                jtag.flash("build/" + build_name + ".fpg")