diff options
| author | Simon Glass <sjg@chromium.org> | 2022-03-05 20:19:00 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2022-03-18 19:24:25 -0600 |
| commit | c9ee33ac974b5ca2a818a1b0d684d5d27675b9a4 (patch) | |
| tree | c1795b4a34ff81bbff6e2d7f49adfdb934a057e7 /tools | |
| parent | 80a66ae646eec82f4650bfc40f609584ba4bcebd (diff) | |
| download | u-boot-c9ee33ac974b5ca2a818a1b0d684d5d27675b9a4.zip u-boot-c9ee33ac974b5ca2a818a1b0d684d5d27675b9a4.tar.gz u-boot-c9ee33ac974b5ca2a818a1b0d684d5d27675b9a4.tar.bz2 | |
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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/binman/control.py | 2 | ||||
| -rw-r--r-- | tools/binman/entry.py | 4 | ||||
| -rw-r--r-- | tools/binman/etype/blob_phase.py | 2 | ||||
| -rw-r--r-- | tools/binman/etype/files.py | 2 | ||||
| -rw-r--r-- | tools/binman/etype/section.py | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/tools/binman/control.py b/tools/binman/control.py index c9d7a08..d4c8dc8 100644 --- a/tools/binman/control.py +++ b/tools/binman/control.py @@ -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) diff --git a/tools/binman/entry.py b/tools/binman/entry.py index 52ba7a8..da77236 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -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 diff --git a/tools/binman/etype/blob_phase.py b/tools/binman/etype/blob_phase.py index 23e2ad6..b937158 100644 --- a/tools/binman/etype/blob_phase.py +++ b/tools/binman/etype/blob_phase.py @@ -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: diff --git a/tools/binman/etype/files.py b/tools/binman/etype/files.py index 13838ec..2081bc7 100644 --- a/tools/binman/etype/files.py +++ b/tools/binman/etype/files.py @@ -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) diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py index 8e8ee50..2868423 100644 --- a/tools/binman/etype/section.py +++ b/tools/binman/etype/section.py @@ -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""" |