mirror of
https://xff.cz/git/u-boot/
synced 2025-09-29 22:41:17 +02:00
binman: Rename ExpandEntries to gen_entries
Leave the 'expand' term for use by entry types which have an expanded version of themselves. Rename this method to indicate that it generates subentries. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
This commit is contained in:
@@ -507,7 +507,7 @@ def PrepareImagesAndDtbs(dtb_fname, select_images, update_fdt, use_expanded):
|
||||
# entry offsets remain the same.
|
||||
for image in images.values():
|
||||
image.CollectBintools()
|
||||
image.ExpandEntries()
|
||||
image.gen_entries()
|
||||
if update_fdt:
|
||||
image.AddMissingProperties(True)
|
||||
image.ProcessFdt(dtb)
|
||||
|
@@ -286,8 +286,8 @@ class Entry(object):
|
||||
"""
|
||||
return {}
|
||||
|
||||
def ExpandEntries(self):
|
||||
"""Expand out entries which produce other entries
|
||||
def gen_entries(self):
|
||||
"""Allow entries to generate other entries
|
||||
|
||||
Some entries generate subnodes automatically, from which sub-entries
|
||||
are then created. This method allows those to be added to the binman
|
||||
|
@@ -42,7 +42,7 @@ class Entry_blob_phase(Entry_section):
|
||||
self.dtb_file = dtb_file
|
||||
self.bss_pad = bss_pad
|
||||
|
||||
def ExpandEntries(self):
|
||||
def gen_entries(self):
|
||||
"""Create the subnodes"""
|
||||
names = [self.root_fname + '-nodtb', self.root_fname + '-dtb']
|
||||
if self.bss_pad:
|
||||
|
@@ -48,7 +48,7 @@ class Entry_files(Entry_section):
|
||||
self._require_matches = fdt_util.GetBool(self._node,
|
||||
'require-matches')
|
||||
|
||||
def ExpandEntries(self):
|
||||
def gen_entries(self):
|
||||
files = tools.get_input_filename_glob(self._pattern)
|
||||
if self._require_matches and not files:
|
||||
self.Raise("Pattern '%s' matched no files" % self._pattern)
|
||||
|
@@ -234,10 +234,10 @@ class Entry_section(Entry):
|
||||
todo)
|
||||
return True
|
||||
|
||||
def ExpandEntries(self):
|
||||
super().ExpandEntries()
|
||||
def gen_entries(self):
|
||||
super().gen_entries()
|
||||
for entry in self._entries.values():
|
||||
entry.ExpandEntries()
|
||||
entry.gen_entries()
|
||||
|
||||
def AddMissingProperties(self, have_image_pos):
|
||||
"""Add new properties to the device tree as needed for this entry"""
|
||||
|
Reference in New Issue
Block a user