u-boot.git/tools/mkimage.c, branch v2016.05-rc2

mkimage: Support placing data outside the FIT

2016-03-14T23:18:29Z

One limitation of FIT is that all the data is 'inline' within it, using a 'data' property in each image node. This means that to find out what is in the FIT it is necessary to scan the entire file. Once loaded it can be scanned and then the images can be copied to the correct place in memory. In SPL it can take a significant amount of time to copy images around in memory. Also loading data that does not end up being used is wasteful. It would be useful if the FIT were small, acting as a directory, with the actual data stored elsewhere. This allows SPL to load the entire FIT, without the images, then load the images it wants later. Add a -E option to mkimage to request that it output an 'external' FIT. Signed-off-by: Simon Glass

mkimage: Support adding device tree files to a FIT

2016-03-14T23:18:29Z

To make the auto-FIT feature useful we need to be able to provide a list of device tree files on the command line for mkimage to add into the FIT. Add support for this feature. So far there is no support for hashing or verified boot using this method. For those cases, a .its file must still be provided. Signed-off-by: Simon Glass

mkimage: Support automatic creating of a FIT without a .its

2016-03-14T23:18:28Z

At present, when generating a FIT, mkimage requires a .its file containing the structure of the FIT and referring to the images to be included. Creating the .its file is a separate step that makes it harder to use FIT. This is not required for creating legacy images. Often the FIT is pretty standard, consisting of an OS image, some device tree files and a single configuration. We can handle this case automatically and avoid needing a .its file at all. To start with, support automatically generate the FIT using a new '-f auto' option. Initially this only supports adding a single image (e.g. a linux kernel) and a single configuration. Signed-off-by: Simon Glass

mkimage: Allow a FIT to include an image of any type

2016-03-14T23:18:27Z

At present FIT images are set up by providing a device tree source file which is a file with a .its extension. We want to support automatically creating this file based on the image supplied to mkimage. This means that even though the final file type is always IH_TYPE_FLATDT, the image inside may be something else. Signed-off-by: Simon Glass

mkimage: Make 'params' static

2016-03-14T18:19:11Z

This is not used outside mkimage.c, so make this variable static. Signed-off-by: Simon Glass

mkimage: Show an error message when usage() is called

2016-03-14T18:19:11Z

Sometimes incorrect arguments are supplied but the reason is not obvious to the user. Add some helpful messages. Signed-off-by: Simon Glass

mkimage: Move usage() up to the top

2016-03-14T18:19:11Z

To avoid a forward declaration, move the usage() function higher in the file. Signed-off-by: Simon Glass

mkimage: Sort the option processing code by option

2016-03-14T18:19:10Z

Adjust the code so that option alphabetical order matches the order in the switch() statement. This makes it easier to find options. Signed-off-by: Simon Glass

mkimage: Convert to use getopt()

2016-03-14T18:19:07Z

The current way of parsing arguments is a bit clumsy. It seems better to use getopt() which is commonly used for this purpose. Convert the code to use getopt() and make a few minor adjustments as needed. Signed-off-by: Simon Glass

mkimage: Move argument processing into its own function

2016-03-14T18:19:01Z

At present main() is very long. Split out the argument processing to make it easier to follow. Signed-off-by: Simon Glass