commit fff147a4b87302980c6ade65d01b923082c0d553
author Simon Glass <sjg@chromium.org> Sat Mar 05 20:19:02 2022 -0700
committer Simon Glass <sjg@chromium.org> Fri Mar 18 19:24:25 2022 -0600
tree 47553e7bdbd50d14ba328bd081a27240fb305fd6
parent b7bad18f25a5f3dc96581a9073f17ed436b7ab23

binman: Rename tools parameter to btools

This shadows the patman.tools library so rename it to avoid a pylint
warning.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>

tools/binman/entry.py

diff --git a/tools/binman/entry.py b/tools/binman/entry.py
index da77236..786c959 100644
--- a/tools/binman/entry.py
+++ b/tools/binman/entry.py
@@ -1101,11 +1101,11 @@
         """
         pass
 
-    def AddBintools(self, tools):
+    def AddBintools(self, btools):
         """Add the bintools used by this entry type
 
         Args:
-            tools (dict of Bintool):
+            btools (dict of Bintool):
         """
         pass
 

tools/binman/etype/fit.py

diff --git a/tools/binman/etype/fit.py b/tools/binman/etype/fit.py
index c003b11..1b93044 100644
--- a/tools/binman/etype/fit.py
+++ b/tools/binman/etype/fit.py
@@ -488,6 +488,6 @@
             section.SetOffsetSize(offset, size)
             section.SetImagePos(self.image_pos)
 
-    def AddBintools(self, tools):
-        super().AddBintools(tools)
-        self.mkimage = self.AddBintool(tools, 'mkimage')
+    def AddBintools(self, btools):
+        super().AddBintools(btools)
+        self.mkimage = self.AddBintool(btools, 'mkimage')

tools/binman/etype/gbb.py

diff --git a/tools/binman/etype/gbb.py b/tools/binman/etype/gbb.py
index e32fae2..7394e4e 100644
--- a/tools/binman/etype/gbb.py
+++ b/tools/binman/etype/gbb.py
@@ -99,5 +99,5 @@
 
         return True
 
-    def AddBintools(self, tools):
-        self.futility = self.AddBintool(tools, 'futility')
+    def AddBintools(self, btools):
+        self.futility = self.AddBintool(btools, 'futility')

tools/binman/etype/intel_ifwi.py

diff --git a/tools/binman/etype/intel_ifwi.py b/tools/binman/etype/intel_ifwi.py
index 46bdf11..4fa7d63 100644
--- a/tools/binman/etype/intel_ifwi.py
+++ b/tools/binman/etype/intel_ifwi.py
@@ -143,5 +143,5 @@
             for entry in self._ifwi_entries.values():
                 entry.WriteSymbols(self)
 
-    def AddBintools(self, tools):
-        self.ifwitool = self.AddBintool(tools, 'ifwitool')
+    def AddBintools(self, btools):
+        self.ifwitool = self.AddBintool(btools, 'ifwitool')

tools/binman/etype/mkimage.py

diff --git a/tools/binman/etype/mkimage.py b/tools/binman/etype/mkimage.py
index c28141f..9f4717e 100644
--- a/tools/binman/etype/mkimage.py
+++ b/tools/binman/etype/mkimage.py
@@ -93,5 +93,5 @@
         for entry in self._mkimage_entries.values():
             entry.CheckFakedBlobs(faked_blobs_list)
 
-    def AddBintools(self, tools):
-        self.mkimage = self.AddBintool(tools, 'mkimage')
+    def AddBintools(self, btools):
+        self.mkimage = self.AddBintool(btools, 'mkimage')

tools/binman/etype/section.py

diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py
index 2868423..ac61d3d 100644
--- a/tools/binman/etype/section.py
+++ b/tools/binman/etype/section.py
@@ -895,6 +895,6 @@
         for entry in self._entries.values():
             entry.CheckAltFormats(alt_formats)
 
-    def AddBintools(self, tools):
+    def AddBintools(self, btools):
         for entry in self._entries.values():
-            entry.AddBintools(tools)
+            entry.AddBintools(btools)

tools/binman/etype/vblock.py

diff --git a/tools/binman/etype/vblock.py b/tools/binman/etype/vblock.py
index a1de982..065b6ed 100644
--- a/tools/binman/etype/vblock.py
+++ b/tools/binman/etype/vblock.py
@@ -97,5 +97,5 @@
         data = self.GetVblock(True)
         return self.ProcessContentsUpdate(data)
 
-    def AddBintools(self, tools):
-        self.futility = self.AddBintool(tools, 'futility')
+    def AddBintools(self, btools):
+        self.futility = self.AddBintool(btools, 'futility')