[PATCH v2 11/25] binman: Rename tools parameter to btools

Simon Glass
2022-02-23T23:06:28Z

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

Signed-off-by: Simon Glass <sjg@chromium.org>
---

(no changes since v1)

tools/binman/entry.py | 4 ++--
tools/binman/etype/fit.py | 6 +++---
tools/binman/etype/gbb.py | 4 ++--
tools/binman/etype/intel_ifwi.py | 4 ++--
tools/binman/etype/mkimage.py | 4 ++--
tools/binman/etype/section.py | 4 ++--
tools/binman/etype/vblock.py | 4 ++--
7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tools/binman/entry.py b/tools/binman/entry.py
index 90a40bb274..00a13c5839 100644
--- a/tools/binman/entry.py
+++ b/tools/binman/entry.py
@@ -1099,11 +1099,11 @@ features to produce new behaviours.
"""
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

diff --git a/tools/binman/etype/fit.py b/tools/binman/etype/fit.py
index 61c72780e9..2b82955226 100644
--- a/tools/binman/etype/fit.py
+++ b/tools/binman/etype/fit.py
@@ -484,6 +484,6 @@ class Entry_fit(Entry_section):
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')
diff --git a/tools/binman/etype/gbb.py b/tools/binman/etype/gbb.py
index e32fae27ce..7394e4e5d3 100644
--- a/tools/binman/etype/gbb.py
+++ b/tools/binman/etype/gbb.py
@@ -99,5 +99,5 @@ class Entry_gbb(Entry):

return True

- def AddBintools(self, tools):
- self.futility = self.AddBintool(tools, 'futility')
+ def AddBintools(self, btools):
+ self.futility = self.AddBintool(btools, 'futility')
diff --git a/tools/binman/etype/intel_ifwi.py b/tools/binman/etype/intel_ifwi.py
index 46bdf116e6..4fa7d636fe 100644
--- a/tools/binman/etype/intel_ifwi.py
+++ b/tools/binman/etype/intel_ifwi.py
@@ -143,5 +143,5 @@ class Entry_intel_ifwi(Entry_blob_ext):
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')
diff --git a/tools/binman/etype/mkimage.py b/tools/binman/etype/mkimage.py
index c28141ff69..9f4717e4ea 100644
--- a/tools/binman/etype/mkimage.py
+++ b/tools/binman/etype/mkimage.py
@@ -93,5 +93,5 @@ class Entry_mkimage(Entry):
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')
diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py
index f2d401d95b..16ee5ed723 100644
--- a/tools/binman/etype/section.py
+++ b/tools/binman/etype/section.py
@@ -894,6 +894,6 @@ class Entry_section(Entry):
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)
diff --git a/tools/binman/etype/vblock.py b/tools/binman/etype/vblock.py
index a1de98290b..065b6ed2f6 100644
--- a/tools/binman/etype/vblock.py
+++ b/tools/binman/etype/vblock.py
@@ -97,5 +97,5 @@ class Entry_vblock(Entry_collection):
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')
--
2.35.1.574.g5d30c73bfb-goog