dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-31 02:15:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

dtoc: Pass include_disabled explicitly

Browse Source 
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 <sjg@chromium.org>
This commit is contained in:
Simon Glass
2017-06-18 22:09:01 -06:00
parent 86290ce40e
commit e36024b05f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/dtoc/dtb_platdata.py
View File

@@ -83,17 +83,17 @@ class DtbPlatdata(object):
_fdt: Fdt object, referencing the device tree _fdt: Fdt object, referencing the device tree
_dtb_fname: Filename of the input device tree binary file _dtb_fname: Filename of the input device tree binary file
_valid_nodes: A list of Node object with compatible strings _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...) _phandle_nodes: A dict of nodes indexed by phandle number (1, 2...)
_outfile: The current output file (sys.stdout or a real file) _outfile: The current output file (sys.stdout or a real file)
_lines: Stashed list of output lines for outputting in the future _lines: Stashed list of output lines for outputting in the future
_phandle_nodes: A dict of Nodes indexed by phandle (an integer) _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._fdt = None
self._dtb_fname = dtb_fname self._dtb_fname = dtb_fname
self._valid_nodes = None self._valid_nodes = None
self._options = options self._include_disabled = include_disabled
self._phandle_nodes = {} self._phandle_nodes = {}
self._outfile = None self._outfile = None
self._lines = [] self._lines = []
@@ -196,7 +196,7 @@ class DtbPlatdata(object):
for node in root.subnodes: for node in root.subnodes:
if 'compatible' in node.props: if 'compatible' in node.props:
status = node.props.get('status') 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'): status.value != 'disabled'):
self._valid_nodes.append(node) self._valid_nodes.append(node)
phandle_prop = node.props.get('phandle') phandle_prop = node.props.get('phandle')

2
tools/dtoc/dtoc.py
View File

@@ -52,7 +52,7 @@ parser.add_option('-o', '--output', action='store', default='-',
if not args: if not args:
raise ValueError('Please specify a command: struct, platdata') 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_dtb()
plat.scan_tree() plat.scan_tree()
plat.setup_output(options.output) plat.setup_output(options.output)