Merge pull request #119 from charles37/master

Add OpenOCD Serial Number Flag

Author: bradjc

tockloader/main.py

@@ -795,6 +795,11 @@ def main():
         default=None,
         help="Specify a specific JLink via serial number. Useful when multiple JLinks are connected to the same machine.",
     )
+    parent_channel.add_argument(
+        "--openocd-serial-number",
+        default=None,
+        help="Specify a specific board via serial number when using OpenOCD. Useful when multiple identical boards are connected.",
+    )
     parent_channel.add_argument(
         "--openocd-board", help="The cfg file in OpenOCD `board` folder."
     )

tockloader/openocd.py

@@ -31,6 +31,9 @@ def __init__(self, args):
         # Command can be passed in as an argument, otherwise use default.
         self.openocd_cmd = getattr(self.args, "openocd_cmd")
 
+        # Store the serial number if provided
+        self.openocd_serial_number = getattr(self.args, "openocd_serial_number")
+
     def attached_board_exists(self):
         # Get a list of attached devices, check if that list has at least
         # one entry.
@@ -132,8 +135,14 @@ def _gather_openocd_cmdline(self, commands, binary, write=True, exit=True):
         # Defaults.
         prefix = ""
         source = "source [find board/{board}];".format(board=self.openocd_board)
+
         cmd_prefix = "init; reset init; halt;"
         cmd_suffix = ""
+        serial_no_cmd = ""
+
+        # Add serial number specification if provided
+        if hasattr(self, "openocd_serial_number") and self.openocd_serial_number:
+            serial_no_cmd = "adapter serial {};".format(self.openocd_serial_number)
 
         # Do the customizations
         if "workareazero" in self.openocd_options:
@@ -151,12 +160,15 @@ def _gather_openocd_cmdline(self, commands, binary, write=True, exit=True):
         if exit:
             cmd_suffix += "exit"
 
-        command_param = "{prefix} {source} {cmd_prefix} {cmd} {cmd_suffix}".format(
-            prefix=prefix,
-            source=source,
-            cmd_prefix=cmd_prefix,
-            cmd="; ".join(commands),
-            cmd_suffix=cmd_suffix,
+        command_param = (
+            "{prefix} {serial_no_cmd} {source} {cmd_prefix} {cmd} {cmd_suffix}".format(
+                prefix=prefix,
+                serial_no_cmd=serial_no_cmd,
+                source=source,
+                cmd_prefix=cmd_prefix,
+                cmd="; ".join(commands),
+                cmd_suffix=cmd_suffix,
+            )
         )
 
         return (