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>

diff --git a/tools/binman/control.py b/tools/binman/control.py
index c9d7a08bbc21d10d7a2e6cfbca28f4e0e1adbadd..d4c8dc89201bd6eb3313f34fe06093aae94549dc 100644 (file)
--- 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 52ba7a81a075e87f12c3111dee4bcfc48ae63826..da77236a8a794a1f7a442f399a8f17ece3134cc9 100644 (file)
--- 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 23e2ad69badda85b4a2425f91cce4ef2804a501e..b937158756fd421f09ba93145ce7220f864d20c3 100644 (file)
--- 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 13838ece8fbaceb379d28f358852a1a29cce63b7..2081bc727b9f33857227c95d1abb3aacbd824d7d 100644 (file)
--- 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 8e8ee50bdf027bfc717532abbd38f79f7df72dc9..286842323d110aad92a76b1532cbd760c5427fd7 100644 (file)
--- 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"""