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

mkimage: Fix warning from fix for generating multi and script images again

2015-12-07T18:28:09+00:00

Seems 6ae6e160 broke creating images in certain cases, there
are two problems with that patch.

First is that the expression "!x == 4 || !x == 6" is ambiguous.  The
intention here was "!(x == 4) || !(x == 6)" based on reading further in
the file, where this was borrowed from.  This however is interpreted by
gcc as "(!x) == 4 || (!x) == 6" and always false.  gcc-5.x will warn
about this case.

The second problem is that we do not want to test for the case of "(NOT x
is 4) OR (NOT x is 6)" but instead "(x is not equal to 4) AND (x is not
equal to 6)".  This is because in those two cases we already execute the
code question in another part of the file.  Rewrite the expression and
add parenthesis for clarity.

Signed-off-by: Marek Vasut 
Cc: Tom Rini 
Cc: Philippe De Swert 
Cc: Simon Glass 
[trini: Re-word Marek's explanation]

mkimage : Fix generating multi and script images

2015-12-05T23:22:35+00:00

Seems 92a655c3 broke creating multi and script type images.
Since the file1:file2:file3 string does not get split up,
it fails on trying to open an non-existing file.

mkimage -A arm -O linux -T multi -C none -d zImage:splash.bmp:device.dtb uimage
tools/mkimage: Can't open zImage:splash.bmp:device.dtb: No such file or directory

Since the sizes of the different parts seem to get added in the actual
routine that handles multi and script type images, we can probably skip the
bit of the code that causes the failure for that type of images.

Signed-off-by: Philippe De Swert

tools/mkimage.c: Clarify help text for -D slightly

2015-10-11T21:12:11+00:00

Try and make it clear that -D will replace all arguments passed to dtc
and is not appending them.

Signed-off-by: Tom Rini

mkimage: Allow padding to any length

2015-09-03T03:28:23+00:00

At present there is an arbitrary limit of 4KB for padding. Rockchip needs
more than that, so remove this restriction.

Signed-off-by: Simon Glass 
Reviewed-by: Joe Hershberger

mkimage: Set up a file size parameter and keep it updated

2015-07-21T23:39:29+00:00

Some functions called by mkimage would like to know the output file size.
Initially this is the same as the input file size, but it may be affected by
adding headers, etc.

Add this information to the image parameters.

Signed-off-by: Simon Glass 
Acked-by: Joe Hershberger

mkimage: Display a better list of available image types

2015-07-21T23:39:20+00:00

Offer to display the available image types in help. Also, rather than
hacking the genimg_get_type_id() function to display a list of types,
do this in the tool. Also, sort the list.

The list of image types is quite long, and hard to discover. Print it out
when we show help information.

Signed-off-by: Simon Glass

dumpimage: add 'T' option to explicitly set the image type

2015-01-29T18:38:41+00:00

Some image types, like "KeyStone GP", do not have magic numbers to
distinguish them from other image types. Thus, the automatic image
type discovery does not work correctly.

This patch also fix some integer type mismatches.

Signed-off-by: Guilherme Maciel Ferreira

imagetool: replace image registration function by linker_lists feature

2015-01-29T18:38:41+00:00

The registration was introduced in commit f86ed6a8d52c99bb2d17d3cac1647edca0c4399c

This commit also removes all registration functions, and the member "next"
from image_type_params struct

Signed-off-by: Guilherme Maciel Ferreira

imagetool: move common code to imagetool module

2015-01-29T18:38:41+00:00

The get_type() and verify_print_header() functions have the
same code on both dumpimage.c and mkimage.c modules.

Signed-off-by: Guilherme Maciel Ferreira

mkimage: fix compilation issues on OpenBSD

2014-08-14T09:48:11+00:00

Signed-off-by: Luka Perkov