u-boot.git/tools/kwbimage.c, branch v2016.09

tools/kwbimage: fix size computations for v1 images

2015-11-29T15:02:44Z

Fix computation of haeder size and binary header size. Size of opt header and some 32bit values were not taken into account. This could result in invalid boot images (due to the wrong binary header size, the image could claim to have another extension header after the binary extension although there is none). Use "uint32_t" instead of "unsigned int" for header size computation. Signed-off-by: Reinhard Pfau Reviewed-by: Stefan Roese Cc: Luka Perkov

tools/kwbimage: fix endianess issue

2015-11-29T15:02:44Z

KWB image header values are in little endian (LE). So adding appropriate cpu_to_leXX() calls to allow building those images on BE hosts, too. Signed-off-by: Reinhard Pfau Reviewed-by: Stefan Roese

tools/kwbimage.c: Make sure that the resulting image is 4-byte aligned

2015-11-29T15:02:44Z

With the dtb added to the main U-Boot image, it can happen, that the resulting image is not 4-byte aligned. As the dtb tends to be unaligned. But the image needs to be 4-byte aligned. At least the Marvell hdrparser tool complains if its unaligned. By returning 1 here in kwbimage_generate(), called via tparams->vrec_header() in mkimage.c, mkimage will automatically pad the resulting image to a 4-byte size if necessary. Signed-off-by: Stefan Roese Cc: Luka Perkov Cc: Dirk Eibach

tools/kwbimage.c: Fix generation of binary header

2015-11-17T22:41:41Z

The binary header ends with one lword, defining if another header follows this one. This additions 4 bytes need to be taken into account in the generation of the header size. And the complete 4 bytes at the end of this binary header need to get cleared. Signed-off-by: Stefan Roese Cc: Luka Perkov Cc: Kevin Smith

kwbimage: Align payload size to 4 bytes

2015-10-21T00:25:01Z

The MVEBU BootROM does not allow non word aligned payloads. Signed-off-by: Stefan Roese Cc: Luka Perkov

tools: kwboot: Add support for UART boot mode patching for Armada XP/38x

2015-10-01T00:02:06Z

Currently, kwboot only allows dynamic UART boot mode patching for SoCs with header version 0 (Orion, Kirkwood). This patch now enables this "-p" feature also for SoCs with header version 1 (Armada XP / 38x etc). With this its possible now to use the UART boot mode without on images that are generated for other boot devices, like SPI. So no need to change BOOT_FROM to "uart" for UART xmodem booting any more. Signed-off-by: Stefan Roese Tested-by: Kevin Smith Cc: Luka Perkov Cc: Dirk Eibach

kwbimage: Rename CONFIG_SYS_SPI_U_BOOT_OFFS to CONFIG_SYS_U_BOOT_OFFS

2015-07-24T07:46:21Z

To use this offset for other boot device (like SDIO/MMC), lets rename it to a more generic name. This will be used be the SDIO/MMC SPL boot support for the A38x. Signed-off-by: Stefan Roese Cc: Luka Perkov Cc: Dirk Eibach

kwbimage: Add support for SDIO/MMC boot device selection

2015-07-24T07:45:56Z

This patch adds support to select the "sdio" as boot device in the kwbimage.cfg file. This line selects this SDIO device: BOOT_FROM sdio Tested on Marvell DB-88F6820-GP board. Signed-off-by: Stefan Roese Cc: Luka Perkov Cc: Dirk Eibach

tools/kwbimage.c: Correct header size for SPI boot

2015-06-14T15:48:28Z

If defined, the macro CONFIG_SYS_SPI_U_BOOT_OFFS allows a board to specify the offset of the payload image into the kwb image file. This value was being used to locate the image, but was not used in the "header size" field of the main header. Move the use of this macro into the function that returns the header size so that the same value is used in all places. Signed-off-by: Kevin Smith Tested-by: Stefan Roese

kwbimage: align v1 binary header to 4B

2015-03-05T21:08:59Z

According to the Armada-XP documentation the binary header format requires the header length to be aligned to 4B. Signed-off-by: Chris Packham Acked-by: Stefan Roese Acked-by: Prafulla Wadaskar