[U-Boot] [PATCH] tools/kwbimage.c: Correct header size for SPI boot

[U-Boot] [PATCH] tools/kwbimage.c: Correct header size for SPI boot

[Kevin Smith]

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 <kevin.smith@elecsyscorp.com>
---
 tools/kwbimage.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index 9540e7e..1ff17ca 100644
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -420,6 +420,18 @@ static size_t image_headersz_v1(struct image_tool_params *params,
 			*hasext = 1;
 	}
 
+#if defined(CONFIG_SYS_SPI_U_BOOT_OFFS)
+	if (headersz > CONFIG_SYS_SPI_U_BOOT_OFFS) {
+		fprintf(stderr, "Error: Image header (incl. SPL image) too big!\n");
+		fprintf(stderr, "header=0x%x CONFIG_SYS_SPI_U_BOOT_OFFS=0x%x!\n",
+			(int)headersz, CONFIG_SYS_SPI_U_BOOT_OFFS);
+		fprintf(stderr, "Increase CONFIG_SYS_SPI_U_BOOT_OFFS!\n");
+		return 0;
+	} else {
+		headersz = CONFIG_SYS_SPI_U_BOOT_OFFS;
+	}
+#endif
+
 	/*
 	 * The payload should be aligned on some reasonable
 	 * boundary
@@ -869,16 +881,6 @@ static int kwbimage_generate(struct image_tool_params *params,
 			sizeof(struct ext_hdr_v0);
 	} else {
 		alloc_len = image_headersz_v1(params, NULL);
-#if defined(CONFIG_SYS_SPI_U_BOOT_OFFS)
-		if (alloc_len > CONFIG_SYS_SPI_U_BOOT_OFFS) {
-			fprintf(stderr, "Error: Image header (incl. SPL image) too big!\n");
-			fprintf(stderr, "header=0x%x CONFIG_SYS_SPI_U_BOOT_OFFS=0x%x!\n",
-				alloc_len, CONFIG_SYS_SPI_U_BOOT_OFFS);
-			fprintf(stderr, "Increase CONFIG_SYS_SPI_U_BOOT_OFFS!\n");
-		} else {
-			alloc_len = CONFIG_SYS_SPI_U_BOOT_OFFS;
-		}
-#endif
 	}
 
 	hdr = malloc(alloc_len);
-- 
2.3.2

[U-Boot] [PATCH] tools/kwbimage.c: Correct header size for SPI boot

[Stefan Roese]

On 16.03.2015 15:58, Kevin Smith wrote:
> 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 <kevin.smith@elecsyscorp.com>

Works fine, so:

Tested-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

[U-Boot] [PATCH] tools/kwbimage.c: Correct header size for SPI boot

[Stefan Roese]

On 17.03.2015 10:24, Stefan Roese wrote:
> On 16.03.2015 15:58, Kevin Smith wrote:
>> 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 <kevin.smith@elecsyscorp.com>
>
> Works fine, so:
>
> Tested-by: Stefan Roese <sr@denx.de>

Luka, you seem to have missed this patch. Please add it to your next 
pull request (if you don't have any objections of course).

Thanks,
Stefan

[U-Boot] [PATCH] tools/kwbimage.c: Correct header size for SPI boot

[Luka Perkov]

Hi Stefan,

On Thu, May 07, 2015 at 04:52:29PM +0200, Stefan Roese wrote:
> On 17.03.2015 10:24, Stefan Roese wrote:
> >On 16.03.2015 15:58, Kevin Smith wrote:
> >>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 <kevin.smith@elecsyscorp.com>
> >
> >Works fine, so:
> >
> >Tested-by: Stefan Roese <sr@denx.de>
> 
> Luka, you seem to have missed this patch. Please add it to your next pull
> request (if you don't have any objections of course).

I knew I missed something :) I've pushed it to marvell/master and will
wait a bit before sending a pull request. Thank you for a reminder.

Luka