| Message ID | 20220223230040.159317-10-sjg@chromium.org |
|---|---|
| State | Superseded |
| Delegated to: | Simon Glass |
| Headers | show |
| Series | binman: rockchip: Migrate from rockchip SPL_FIT_GENERATOR script | expand |
On 24/02/2022 02:00, Simon Glass wrote: > 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> > --- > > Changes in v2: > - Add patch to rename ExpandEntries to gen_entries > > tools/binman/control.py | 2 +- > tools/binman/entry.py | 4 ++-- > tools/binman/etype/blob_phase.py | 2 +- > tools/binman/etype/files.py | 2 +- > tools/binman/etype/section.py | 6 +++--- > 5 files changed, 8 insertions(+), 8 deletions(-) Reviewed-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
diff --git a/tools/binman/control.py b/tools/binman/control.py index a179f78129..be2b422e62 100644 --- a/tools/binman/control.py +++ b/tools/binman/control.py @@ -501,7 +501,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) diff --git a/tools/binman/entry.py b/tools/binman/entry.py index a59eb56f14..90a40bb274 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -284,8 +284,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 diff --git a/tools/binman/etype/blob_phase.py b/tools/binman/etype/blob_phase.py index ed25e467a1..aba93b759b 100644 --- a/tools/binman/etype/blob_phase.py +++ b/tools/binman/etype/blob_phase.py @@ -39,7 +39,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: diff --git a/tools/binman/etype/files.py b/tools/binman/etype/files.py index 0650a69c55..210a16d671 100644 --- a/tools/binman/etype/files.py +++ b/tools/binman/etype/files.py @@ -46,7 +46,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) diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py index 0cfee5f3e3..f2d401d95b 100644 --- a/tools/binman/etype/section.py +++ b/tools/binman/etype/section.py @@ -233,10 +233,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"""
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> --- Changes in v2: - Add patch to rename ExpandEntries to gen_entries tools/binman/control.py | 2 +- tools/binman/entry.py | 4 ++-- tools/binman/etype/blob_phase.py | 2 +- tools/binman/etype/files.py | 2 +- tools/binman/etype/section.py | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-)