diff options
| author | Tom Rini <trini@ti.com> | 2015-02-06 12:02:59 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-06 12:02:59 -0500 |
| commit | 5c123f5fbfa2f7ae43f08a0f92073e90330d704a (patch) | |
| tree | 8f79c94d7a04301d3ef51b4bc10571acc7bc9706 /tools | |
| parent | 4e79908044e4ebf186464cf118497458faf0903c (diff) | |
| parent | 68102b81e8fb699087ec5757a75676c6c65af3fd (diff) | |
| download | talos-obmc-uboot-5c123f5fbfa2f7ae43f08a0f92073e90330d704a.tar.gz talos-obmc-uboot-5c123f5fbfa2f7ae43f08a0f92073e90330d704a.zip | |
Merge git://git.denx.de/u-boot-marvell
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/kwbimage.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tools/kwbimage.c b/tools/kwbimage.c index 66f459ad6b..28ce1e4f08 100644 --- a/tools/kwbimage.c +++ b/tools/kwbimage.c @@ -16,6 +16,7 @@ #include <image.h> #include <stdint.h> #include "kwbimage.h" +#include <config.h> #define ALIGN_SUP(x, a) (((x) + (a - 1)) & ~(a - 1)) @@ -868,6 +869,16 @@ 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); |
