driver: multiple: remove tool fallbacks

These are no longer required, since get_tool now returns the passed in
tool when no tool can be found in the yaml file.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
(cherry picked from commit 20caff8)
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>

Author: Emantor

labgrid/driver/dfudriver.py

@@ -18,7 +18,7 @@ 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('dfu-util') or 'dfu-util'
+            self.tool = self.target.env.config.get_tool('dfu-util')
         else:
             self.tool = 'dfu-util'
 

labgrid/driver/fastbootdriver.py

@@ -36,7 +36,7 @@ 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('fastboot') or 'fastboot'
+            self.tool = self.target.env.config.get_tool('fastboot')
         else:
             self.tool = 'fastboot'
 

labgrid/driver/lxausbmuxdriver.py

@@ -19,7 +19,7 @@ class LXAUSBMuxDriver(Driver):
     def __attrs_post_init__(self):
         super().__attrs_post_init__()
         if self.target.env:
-            self.tool = self.target.env.config.get_tool('usbmuxctl') or 'usbmuxctl'
+            self.tool = self.target.env.config.get_tool('usbmuxctl')
         else:
             self.tool = 'usbmuxctl'
 

labgrid/driver/openocddriver.py

@@ -51,7 +51,7 @@ def __attrs_post_init__(self):
 
         # FIXME make sure we always have an environment or config
         if self.target.env:
-            self.tool = self.target.env.config.get_tool('openocd') or 'openocd'
+            self.tool = self.target.env.config.get_tool('openocd')
             self.config = self.target.env.config.resolve_path_str_or_list(self.config)
             self.search = self.target.env.config.resolve_path_str_or_list(self.search)
         else:

labgrid/driver/powerdriver.py

@@ -69,7 +69,7 @@ class SiSPMPowerDriver(Driver, PowerResetMixin, PowerProtocol):
     def __attrs_post_init__(self):
         super().__attrs_post_init__()
         if self.target.env:
-            self.tool = self.target.env.config.get_tool('sispmctl') or 'sispmctl'
+            self.tool = self.target.env.config.get_tool('sispmctl')
         else:
             self.tool = 'sispmctl'
 
@@ -316,7 +316,7 @@ class USBPowerDriver(Driver, PowerResetMixin, PowerProtocol):
     def __attrs_post_init__(self):
         super().__attrs_post_init__()
         if self.target.env:
-            self.tool = self.target.env.config.get_tool('uhubctl') or 'uhubctl'
+            self.tool = self.target.env.config.get_tool('uhubctl')
         else:
             self.tool = 'uhubctl'
 

labgrid/driver/quartushpsdriver.py

@@ -32,8 +32,8 @@ def __attrs_post_init__(self):
 
         # FIXME make sure we always have an environment or config
         if self.target.env:
-            self.tool = self.target.env.config.get_tool('quartus_hps') or 'quartus_hps'
-            self.jtag_tool = self.target.env.config.get_tool('jtagconfig') or 'jtagconfig'
+            self.tool = self.target.env.config.get_tool('quartus_hps')
+            self.jtag_tool = self.target.env.config.get_tool('jtagconfig')
         else:
             self.tool = 'quartus_hps'
             self.jtag_tool = 'jtagconfig'

labgrid/driver/usbloader.py

@@ -23,7 +23,7 @@ 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('mxs-usb-loader') or 'mxs-usb-loader'
+            self.tool = self.target.env.config.get_tool('mxs-usb-loader')
         else:
             self.tool = 'mxs-usb-loader'
 
@@ -60,7 +60,7 @@ 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('imx-usb-loader') or 'imx-usb-loader'
+            self.tool = self.target.env.config.get_tool('imx-usb-loader')
         else:
             self.tool = 'imx-usb-loader'
 
@@ -99,7 +99,7 @@ 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('rk-usb-loader') or 'rk-usb-loader'
+            self.tool = self.target.env.config.get_tool('rk-usb-loader')
         else:
             self.tool = 'rk-usb-loader'
 
@@ -163,7 +163,7 @@ 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') or 'uuu-loader'
+            self.tool = self.target.env.config.get_tool('uuu-loader')
         else:
             self.tool = 'uuu-loader'
 
@@ -208,7 +208,7 @@ 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('imx_usb') or 'imx_usb'
+            self.tool = self.target.env.config.get_tool('imx_usb')
         else:
             self.tool = 'imx_usb'
 

labgrid/driver/usbsdmuxdriver.py

@@ -25,7 +25,7 @@ class USBSDMuxDriver(Driver):
     def __attrs_post_init__(self):
         super().__attrs_post_init__()
         if self.target.env:
-            self.tool = self.target.env.config.get_tool('usbsdmux') or 'usbsdmux'
+            self.tool = self.target.env.config.get_tool('usbsdmux')
         else:
             self.tool = 'usbsdmux'
 

labgrid/driver/usbsdwiredriver.py

@@ -21,7 +21,7 @@ class USBSDWireDriver(Driver):
     def __attrs_post_init__(self):
         super().__attrs_post_init__()
         if self.target.env:
-            self.tool = self.target.env.config.get_tool('sd-mux-ctrl') or 'sd-mux-ctrl'
+            self.tool = self.target.env.config.get_tool('sd-mux-ctrl')
         else:
             self.tool = 'sd-mux-ctrl'