Recognize version string "0.12" in recent OpenOCD master
authorBoris Shingarov <shingarov@labware.com>
Sat, 24 Sep 2022 11:08:42 +0000 (07:08 -0400)
committerBoris Shingarov <shingarov@labware.com>
Sat, 24 Sep 2022 11:15:48 +0000 (07:15 -0400)
Starting from 5e7612eb4, OpenOCD identifies itself as 0.12.
This causes Microwatt's flash-arty script to fail.  Because neither
the cfg nor the proxy bitstream are affected, we can keep treating
everything as indistinguishable from 0.11.  This patch simply tests
for "0.12" as an alias; it would probably be better to replace this
confusing terminology with something like "single-tap/multi-tap".

Signed-off-by: Boris Shingarov <shingarov@labware.com>
openocd/flash-arty

index 6d4d13d8edb62ccb3b6d467eb49aec747d5318b0..6b01bf85d32cb58e3006ad3d3234e1038167a446 100755 (executable)
@@ -27,6 +27,8 @@ def get_version():
         return ""
     if a.stderr.count(b"0.11"):
         return "_openocd_v0.11"
+    if a.stderr.count(b"0.12"):
+        return "_openocd_v0.11"
 
 parser = argparse.ArgumentParser()
 parser.add_argument("file", help="file to write to flash")