u-boot.git/tools/binman/etype/cbfs.py, branch main

binman: Fix typing for python >= 3.7

2025-07-22T17:30:03Z

To get the [] annotation working with python 3.7 and 3.8, import annotations. Reported-by: Tim Harvey Fixes: 21bc3433a43d ("binman: rework dropping absent entries from packaged image") Reviewed-by: Bryan Brattlof Signed-off-by: Yannic Moog Tested-by: Tim Harvey

binman: rework dropping absent entries from packaged image

2025-06-26T15:54:05Z

When blobs are absent and are marked as optional, they can be safely dropped from the binman tree. Use the drop_absent function for that. Rename drop_absent to drop_absent_optional as we do not want to drop any entries that are absent; they should be reported by binman as errors when they are missing. We also reorder the processing of the image the following: - We call the CheckForProblems function before the image is built. - We drop entries after we checked for problems with the image. This is okay because CheckForProblems does not look at the file we have written but rather queries the data structure (image) built with binman. This also allows us to get all error and warning messages that we want to report while avoiding putting missing optional entries in the final image. As only the blobs are dropped, the sections still remain in the assembled image. Thus add them to the expected test case checks where necessary. In addition, a rework of testPackTeeOsOptional test case is necessary. The test did not really do what it was supposed to. The description said that optional binary is tested, but the binary is not marked as optional. Further, the tee.elf file, when included in the image properly, also shows up in the image data. This must be added as well. As there is no global variable for the elf data, set the pathname to the elf file that was created when setting up the test suite. For the test case get the filename and read the contents, comparing them to the contents of the created binman image. Signed-off-by: Yannic Moog Reviewed-by: Bryan Brattlof

binman: Avoid setting the image_pos attribute directly

2024-09-26T10:40:30Z

Two places set this attribute directly. Update them to use the function provided. Signed-off-by: Simon Glass

binman: Support updating section contents

2023-03-08T21:15:14Z

Implement this feature since it is useful for updating FITs within an image. Signed-off-by: Simon Glass

binman: Forward AddBintools calls to sub entries in cbfs_util

2022-08-21T00:07:33Z

Forward AddBintools calls to sub entries in cbfs_util to collect bintools of sub entries. Signed-off-by: Stefan Herbrechtsmeier Reviewed-by: Simon Glass

binman: Correct pylint errors

2022-03-02T15:28:12Z

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: Allow extracting a file in an alternative format

2021-12-05T16:22:41Z

In some cases entries encapsulate other data and it is useful to access the data within. An example is the fdtmap which consists of a 16-byte header, followed by a devicetree. Provide an option to specify an alternative format when extracting files. In the case of fdtmap, this is 'fdt', which produces an FDT file which can be viewed with fdtdump. Signed-off-by: Simon Glass

binman: cfbs: Refactor ObtainContents() for consistency

2021-12-02T16:16:30Z

Update this to use the same arguments as entry_Section uses. Signed-off-by: Simon Glass

binman: cbfs: Refactor the init process

2021-12-02T16:16:30Z

Update the constructor to work in the recommended way, where the node properties are read in a separate function. This makes it more similar to entry_Section. Signed-off-by: Simon Glass

binman: Use normal entries in cbfs

2021-12-02T16:16:30Z

This currently uses _cbfs_entries[] to store entries. Since the entries are in fact valid etypes, we may as well use the same name as entry_Section uses, which is _entries. This allows reusing more of the code there (in a future patch). Signed-off-by: Simon Glass