This option is the only one actually used by the dtb_platdata class. Pass
it explicitly to avoid needing to pass the whole option object to the
constructor.
Signed-off-by: Simon Glass <s...@chromium.org>
---
tools/dtoc/dtb_platdata.py | 8 ++++----
tools/dtoc/dtoc.py | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/dtoc/dtb_platdata.py b/tools/dtoc/dtb_platdata.py
index d86651b9aa..de4a88b5a9 100644
--- a/tools/dtoc/dtb_platdata.py
+++ b/tools/dtoc/dtb_platdata.py
@@ -83,17 +83,17 @@ class DtbPlatdata(object):
_fdt: Fdt object, referencing the device tree
_dtb_fname: Filename of the input device tree binary file
_valid_nodes: A list of Node object with compatible strings
- _options: Command-line options
+ _include_disabled: true to include nodes marked status = "disabled"
_phandle_nodes: A dict of nodes indexed by phandle number (1, 2...)
_outfile: The current output file (sys.stdout or a real file)
_lines: Stashed list of output lines for outputting in the future
_phandle_nodes: A dict of Nodes indexed by phandle (an integer)
"""
- def __init__(self, dtb_fname, options):
+ def __init__(self, dtb_fname, include_disabled):
self._fdt = None
self._dtb_fname = dtb_fname
self._valid_nodes = None
- self._options = options
+ self._include_disabled = include_disabled
self._phandle_nodes = {}
self._outfile = None
self._lines = []
@@ -196,7 +196,7 @@ class DtbPlatdata(object):
for node in root.subnodes:
if 'compatible' in node.props:
status = node.props.get('status')
- if (not self._options.include_disabled and not status or
+ if (not self._include_disabled and not status or
status.value != 'disabled'):
self._valid_nodes.append(node)
phandle_prop = node.props.get('phandle')
diff --git a/tools/dtoc/dtoc.py b/tools/dtoc/dtoc.py
index abda9191fa..1f17ea47e0 100755
--- a/tools/dtoc/dtoc.py
+++ b/tools/dtoc/dtoc.py
@@ -52,7 +52,7 @@ parser.add_option('-o', '--output', action='store',
default='-',
if not args:
raise ValueError('Please specify a command: struct, platdata')
-plat = dtb_platdata.DtbPlatdata(options.dtb_file, options)
+plat = dtb_platdata.DtbPlatdata(options.dtb_file, options.include_disabled)
plat.scan_dtb()
plat.scan_tree()
plat.setup_output(options.output)
--
2.13.1.518.g3df882009-goog
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
