mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
binman: Add a function to check for special section nodes
This appears in two places in the code. Use a shared function instead. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
62ef2f7bf3
commit
97fb8081ec
2 changed files with 13 additions and 3 deletions
|
@ -655,8 +655,7 @@ class Entry_fit(Entry_section):
|
|||
|
||||
for subnode in node.subnodes:
|
||||
subnode_path = f'{rel_path}/{subnode.name}'
|
||||
if has_images and not (subnode.name.startswith('hash') or
|
||||
subnode.name.startswith('signature')):
|
||||
if has_images and not self.IsSpecialSubnode(subnode):
|
||||
# This subnode is a content node not meant to appear in
|
||||
# the FIT (e.g. "/images/kernel/u-boot"), so don't call
|
||||
# fsw.add_node() or _add_node() for it.
|
||||
|
|
|
@ -169,6 +169,17 @@ class Entry_section(Entry):
|
|||
self._ignore_missing = False
|
||||
self._filename = None
|
||||
|
||||
def IsSpecialSubnode(self, node):
|
||||
"""Check if a node is a special one used by the section itself
|
||||
|
||||
Some notes are used for hashing / signatures and do not add entries to
|
||||
the actual section.
|
||||
|
||||
Returns:
|
||||
bool: True if the node is a special one, else False
|
||||
"""
|
||||
return node.name.startswith('hash') or node.name.startswith('signature')
|
||||
|
||||
def ReadNode(self):
|
||||
"""Read properties from the section node"""
|
||||
super().ReadNode()
|
||||
|
@ -195,7 +206,7 @@ class Entry_section(Entry):
|
|||
|
||||
def ReadEntries(self):
|
||||
for node in self._node.subnodes:
|
||||
if node.name.startswith('hash') or node.name.startswith('signature'):
|
||||
if self.IsSpecialSubnode(node):
|
||||
continue
|
||||
entry = Entry.Create(self, node,
|
||||
expanded=self.GetImage().use_expanded,
|
||||
|
|
Loading…
Reference in a new issue