colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

binman: Update fit to use node instead of subnode

Browse Source 
It doesn't make sense to use 'subnode' as a function parameter since it
is just a 'node' so far as the function is concerned. Update two functions
to use 'node' instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
This commit is contained in:
Simon Glass
2022-03-05 20:19:10 -07:00
parent ce4e402a32
commit 01f467e2d3
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/binman/etype/fit.py
View File

@@ -328,7 +328,7 @@ class Entry_fit(Entry_section):
return return
fsw.property(pname, prop.bytes) fsw.property(pname, prop.bytes)
def _gen_fdt_nodes(subnode, depth, in_images): def _gen_fdt_nodes(node, depth, in_images):
"""Generate FDT nodes """Generate FDT nodes
This creates one node for each member of self._fdts using the This creates one node for each member of self._fdts using the
@@ -338,7 +338,7 @@ class Entry_fit(Entry_section):
first. first.
Args: Args:
subnode (None): Generator node to process node (None): Generator node to process
depth: Current node depth (0 is the base 'fit' node) depth: Current node depth (0 is the base 'fit' node)
in_images: True if this is inside the 'images' node, so that in_images: True if this is inside the 'images' node, so that
'data' properties should be generated 'data' properties should be generated
@@ -346,10 +346,10 @@ class Entry_fit(Entry_section):
if self._fdts: if self._fdts:
# Generate nodes for each FDT # Generate nodes for each FDT
for seq, fdt_fname in enumerate(self._fdts): for seq, fdt_fname in enumerate(self._fdts):
node_name = subnode.name[1:].replace('SEQ', str(seq + 1)) node_name = node.name[1:].replace('SEQ', str(seq + 1))
fname = tools.get_input_filename(fdt_fname + '.dtb') fname = tools.get_input_filename(fdt_fname + '.dtb')
with fsw.add_node(node_name): with fsw.add_node(node_name):
for pname, prop in subnode.props.items(): for pname, prop in node.props.items():
val = prop.bytes.replace( val = prop.bytes.replace(
b'NAME', tools.to_bytes(fdt_fname)) b'NAME', tools.to_bytes(fdt_fname))
val = val.replace( val = val.replace(
@@ -371,7 +371,7 @@ class Entry_fit(Entry_section):
else: else:
self.Raise("Generator node requires 'fit,fdt-list' property") self.Raise("Generator node requires 'fit,fdt-list' property")
def _gen_node(base_node, subnode, depth, in_images): def _gen_node(base_node, node, depth, in_images):
"""Generate nodes from a template """Generate nodes from a template
This creates one node for each member of self._fdts using the This creates one node for each member of self._fdts using the
@@ -383,14 +383,14 @@ class Entry_fit(Entry_section):
Args: Args:
base_node (Node): Base Node of the FIT (with 'description' base_node (Node): Base Node of the FIT (with 'description'
property) property)
subnode (Node): Generator node to process node (Node): Generator node to process
depth (int): Current node depth (0 is the base 'fit' node) depth (int): Current node depth (0 is the base 'fit' node)
in_images (bool): True if this is inside the 'images' node, so in_images (bool): True if this is inside the 'images' node, so
that 'data' properties should be generated that 'data' properties should be generated
""" """
oper = self._get_operation(base_node, subnode) oper = self._get_operation(base_node, node)
if oper == OP_GEN_FDT_NODES: if oper == OP_GEN_FDT_NODES:
_gen_fdt_nodes(subnode, depth, in_images) _gen_fdt_nodes(node, depth, in_images)
def _add_node(base_node, depth, node): def _add_node(base_node, depth, node):
"""Add nodes to the output FIT """Add nodes to the output FIT