leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

binman: Correct use of 'replace' in IFWI tests

Browse Source 
At present the Intel IFWI entry uses 'replace' without the 'ifwi-' prefix.
This is a fairly generic name which might conflict with the main Entry
base class at some point, if more features are added. Add a prefix.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2019-08-24 07:22:47 -06:00
parent 39c8e47d2e
commit 3da9ce8dd4
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/binman/README.entries
View File

@ -432,6 +432,12 @@ The contents of the IFWI are specified by the subnodes of the IFWI node.
Each subnode describes an entry which is placed into the IFWFI with a given
sub-partition (and optional entry name).
Properties for subnodes:
ifwi-subpart - sub-parition to put this entry into, e.g. "IBBP"
ifwi-entry - entry name t use, e.g. "IBBL"
ifwi-replace - if present, indicates that the item should be replaced
in the IFWI. Otherwise it is added.
See README.x86 for information about x86 binary blobs.

8
tools/binman/etype/intel_ifwi.py
View File

@ -36,6 +36,12 @@ class Entry_intel_ifwi(Entry_blob):
Each subnode describes an entry which is placed into the IFWFI with a given
sub-partition (and optional entry name).
Properties for subnodes:
ifwi-subpart - sub-parition to put this entry into, e.g. "IBBP"
ifwi-entry - entry name t use, e.g. "IBBL"
ifwi-replace - if present, indicates that the item should be replaced
in the IFWI. Otherwise it is added.
See README.x86 for information about x86 binary blobs.
"""
def __init__(self, section, etype, node):
@ -95,7 +101,7 @@ class Entry_intel_ifwi(Entry_blob):
for node in self._node.subnodes:
entry = Entry.Create(self.section, node)
entry.ReadNode()
entry._ifwi_replace = fdt_util.GetBool(node, 'replace')
entry._ifwi_replace = fdt_util.GetBool(node, 'ifwi-replace')
entry._ifwi_subpart = fdt_util.GetString(node, 'ifwi-subpart')
entry._ifwi_entry_name = fdt_util.GetString(node, 'ifwi-entry')
self._ifwi_entries[entry._ifwi_subpart] = entry

2
tools/binman/test/111_x86-rom-ifwi.dts
View File

@ -20,7 +20,7 @@
convert-fit;
u-boot-tpl {
replace;
ifwi-replace;
ifwi-subpart = "IBBP";
ifwi-entry = "IBBL";
};

2
tools/binman/test/112_x86-rom-ifwi-nodesc.dts
View File

@ -19,7 +19,7 @@
filename = "ifwi.bin";
u-boot-tpl {
replace;
ifwi-replace;
ifwi-subpart = "IBBP";
ifwi-entry = "IBBL";
};

2
tools/binman/test/113_x86-rom-ifwi-nodata.dts
View File

@ -20,7 +20,7 @@
_testing {
return-unknown-contents;
replace;
ifwi-replace;
ifwi-subpart = "IBBP";
ifwi-entry = "IBBL";
};