u-boot.git/tools/binman/entry.py, branch v2022.07

binman: Fix unique names having '/.' for images read from files

2022-04-25T14:10:41+00:00

Binman can embed a copy of the image description into the images it
builds as a fdtmap entry, but it omits the /binman/ prefix
from the node paths while doing so. When reading an already-built image
file, entries are reconstructed using this fdtmap and their associated
nodes still lack that prefix.

Some entries like fit and vblock create intermediate files whose names
are based on an entry unique name. This name is constructed from their
node's path by concatenating the parents with dots up to the binman
node, e.g. /binman/image/foo/bar becomes 'image.foo.bar'.

However, we don't have this /binman/image prefix when replacing entries
in such an image. The /foo/bar entry we read when doing so erroneously
has the unique name of '/.foo.bar', causing permission errors when the
entry attempts to create files based on that.

Fix the unique-name generation by stopping at the '/' node like how it
stops at the binman node. As the unique names are used as filenames, add
tests that check if they're safe to use as filenames.

Signed-off-by: Alper Nebi Yasak 
Reviewed-by: Simon Glass

binman: Allow mkimage to use a non-zero fake-blob size

2022-03-19T01:24:25+00:00

Unfortunately mkimage gets upset with zero-sized files. Update the
ObtainContents() method to support specifying the size, if a fake blob is
created.

Signed-off-by: Simon Glass 
Reviewed-by: Alper Nebi Yasak

binman: Make fake blobs zero-sized by default

2022-03-19T01:24:25+00:00

On x86 devices having even a small amount of data can cause an overlap
between regions. For example, bayleybay complains when the intel-vga
region overlaps with u-boot-ucode:

   ImagePos    Offset      Size  Name
       00000000  00800000  main-section
        ff800000  00000080  intel-descriptor
        ff800400  00000080  intel-me
        fff00000  00098f24  u-boot-with-ucode-ptr
        fff98f24  00001aa0  u-boot-dtb-with-ucode
        fff9a9d0  0002a000  u-boot-ucode
        fffb0000  00000080  intel-vga
   ...

It is safer to use an empty file in most cases. Add an option to set the
size for those uses that need it.

Signed-off-by: Simon Glass 
Reviewed-by: Alper Nebi Yasak

binman: Change how faked blobs are created

2022-03-19T01:24:25+00:00

At present fake blobs are created but internally an empty blob is used.
Change it to use the contents of the faked file. Also return whether the
blob was faked, in case the caller needs to know that.

Add a TODO to put fake blobs in their own directory.

Signed-off-by: Simon Glass 
Reviewed-by: Alper Nebi Yasak

binman: Rename tools parameter to btools

2022-03-19T01:24:25+00:00

This shadows the patman.tools library so rename it to avoid a pylint
warning.

Signed-off-by: Simon Glass 
Reviewed-by: Alper Nebi Yasak

binman: Rename ExpandEntries to gen_entries

2022-03-19T01:24:25+00:00

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 
Reviewed-by: Alper Nebi Yasak

binman: Rename ExpandToLimit to extend_to_limit

2022-03-19T01:24:25+00:00

The word 'expand' is used for entries which generate subentries. It is
also used for entries that can have an '_expanded' version which is used
to break out its contents.

Rather than talking about expanding an entry's size, use the term
'extending'. It is slightly more precise and avoids the above conflicts.

This change renders the old 'expand-size' property invalid, so add an
error check for that.

Signed-off-by: Simon Glass 
Reviewed-by: Alper Nebi Yasak

binman: Tweak collect_contents_to_file() and docs

2022-03-19T01:24:25+00:00

Update the return value of this function, fix the 'create' typo and
update the documentation for clarity.

Signed-off-by: Simon Glass 
Reviewed-by: Alper Nebi Yasak 
Suggested-by: Alper Nebi Yasak

binman: Correct pylint errors

2022-03-02T15:28:12+00:00

Fix pylint errors that can be fixed and mask those that seem to be
incorrect.

A complication with binman is that it tries to avoid importing libfdt
(or anything that imports it) unless needed, so that things like help
still work if it is missing.

Note that two tests are duplicated in binman and two others have
duplicate names, so both of these issues are fixed also.

Signed-off-by: Simon Glass

binman: Move entry-data collection into a Entry method

2022-02-22T17:05:44+00:00

Collecting the data from a list of entries and putting it in a file is
a useful operation that will be needed by other entry types. Put this into
a method in the Entry class.

Add some documentation about how to collect data for an entry type.

Signed-off-by: Simon Glass