Update UUUDriver

labgrid/driver/usbloader.py

@@ -152,6 +152,14 @@ def load(self, filename=None):
 @target_factory.reg_driver
 @attr.s(eq=False)
 class UUUDriver(Driver, BootstrapProtocol):
+    """
+    This is a driver for NXPs uuu tool.
+    https://github.com/nxp-imx/mfgtools
+
+    It uses the -m parameter of uuu to lock in the specific usb device.
+    Everything specified in the script attribute will be executed with '-b'
+    parameter.
+    """
     bindings = {
         "loader": {"IMXUSBLoader", "NetworkIMXUSBLoader", "MXSUSBLoader", "NetworkMXSUSBLoader"},
     }
@@ -163,9 +171,9 @@ def __attrs_post_init__(self):
         super().__attrs_post_init__()
         # FIXME make sure we always have an environment or config
         if self.target.env:
-            self.tool = self.target.env.config.get_tool('uuu-loader')
+            self.tool = self.target.env.config.get_tool('uuu')
         else:
-            self.tool = 'uuu-loader'
+            self.tool = 'uuu'
 
     def on_activate(self):
         pass
@@ -181,10 +189,18 @@ def load(self, filename=None):
         mf = ManagedFile(filename, self.loader)
         mf.sync_to_resource()
 
-        cmd = ['-b', self.script] if self.script else []
+        # Convert usb path to the format the uuu-tool expects
+        # 1-1.2.1 -> 1:121
+        usb_device = str(self.loader.path).replace('.', '').replace('-', ':')
+
+        cmd = (
+            [self.tool, '-v', '-m', usb_device]
+            + (['-b', self.script] if self.script else [])
+            + [mf.get_remote_path()]
+        )
 
         processwrapper.check_output(
-            self.loader.command_prefix + [self.tool] + cmd + [mf.get_remote_path()],
+            self.loader.command_prefix + cmd,
             print_on_silent_log=True
         )
 

man/labgrid-device-config.5

@@ -152,8 +152,8 @@ Path to the usbmuxctl tool, used by the LXAUSBMuxDriver.
 Path to the usbsdmux tool, used by the USBSDMuxDriver.
 See:  <https://github.com/linux\-automation/usbsdmux> 
 .TP
-.B \fBuuu\-loader\fP
-Path to the uuu\-loader binary, used by the UUUDriver.
+.B \fBuuu\fP
+Path to the uuu binary, used by the UUUDriver.
 See:  <https://github.com/nxp\-imx/mfgtools> 
 .TP
 .B \fBykushcmd\fP

man/labgrid-device-config.rst

@@ -151,8 +151,8 @@ TOOLS KEYS
     Path to the usbsdmux tool, used by the USBSDMuxDriver.
     See: https://github.com/linux-automation/usbsdmux
 
-``uuu-loader``
-    Path to the uuu-loader binary, used by the UUUDriver.
+``uuu``
+    Path to the uuu binary, used by the UUUDriver.
     See: https://github.com/nxp-imx/mfgtools
 
 ``ykushcmd``