diff options
| author | Simon Glass <sjg@chromium.org> | 2021-03-21 18:24:30 +1300 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2021-03-27 16:26:48 +1300 |
| commit | 3d4333829388db834e6f0945bbefc837da590d78 (patch) | |
| tree | c0c2bf0e778ced9cf084c3c6f3d93451aac7df14 /tools/binman/entry.py | |
| parent | e9e0db8894523b53af9ecbe1b995fabf3d3c5b78 (diff) | |
| download | u-boot-3d4333829388db834e6f0945bbefc837da590d78.tar.gz u-boot-3d4333829388db834e6f0945bbefc837da590d78.tar.xz u-boot-3d4333829388db834e6f0945bbefc837da590d78.zip | |
binman: Allow disabling expanding an entry
At present there is a command-line flag to disable substitution of expanded
entries. Add an option to the entry node as well, so it can be controlled
at the node level.
Add a test to cover this. Fix up the comment to the checkSymbols() function
it uses, while we are here.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/binman/entry.py')
| -rw-r--r-- | tools/binman/entry.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/binman/entry.py b/tools/binman/entry.py index 1cfa024a9f..ac25986ee6 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -164,7 +164,8 @@ class Entry(object): if obj and expanded: # Check whether to use the expanded entry new_etype = etype + '-expanded' - if obj.UseExpanded(node, etype, new_etype): + can_expand = not fdt_util.GetBool(node, 'no-expanded') + if can_expand and obj.UseExpanded(node, etype, new_etype): etype = new_etype else: obj = None |