tools: kwbimage: Remove v1 kwbimage SPL padding to CONFIG_SYS_U_BOOT_OFFS bytes

This padding depends on board config file and therefore it makes the
mkimage binary tool board specific, which is not correct. One cannot use
mkimage tool built as a result for board A to generate images for board
B, even if both A and B are on the same platform.

This CONFIG_SYS_U_BOOT_OFFS padding was needed when kwbimage v1 contained
SPL code which loaded U-Boot proper based on CONFIG_SYS_U_BOOT_OFFS,
instead of reading correct offset from kwbimage header.

Now that SPL code parses kwbimage header and deterinate correct offset,
there is no need for this CONFIG_SYS_U_BOOT_OFFS padding anymore.

By removing it we also reduce the size of SPL code and therefore also
decrease the final size of v1 kwbimage. This means there is more space
for U-Boot proper binary.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/tools/Makefile b/tools/Makefile
index 35aefc207c31cc01cdf3982f33fb9443a0d8861e..4a86321f6467e0cc25f5a30c4097bc9637c6c040 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -169,10 +169,6 @@ HOST_EXTRACFLAGS   += -DCONFIG_FIT_SIGNATURE_MAX_SIZE=0xffffffff
 HOST_EXTRACFLAGS       += -DCONFIG_FIT_CIPHER
 endif
 
-ifneq ($(CONFIG_SYS_U_BOOT_OFFS),)
-HOSTCFLAGS_kwbimage.o += -DCONFIG_SYS_U_BOOT_OFFS=$(CONFIG_SYS_U_BOOT_OFFS)
-endif
-
 # MXSImage needs LibSSL
 ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_ARMADA_38X)$(CONFIG_TOOLS_LIBCRYPTO),)
 HOSTCFLAGS_kwbimage.o += \

diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index 9ecda861e4f828bb8c73d258c8ef4d559b03e16f..ccb0b9226696f08d51f2a65fbf9798baa55c2b6e 100644 (file)
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -979,19 +979,6 @@ static size_t image_headersz_v1(int *hasext)
                        *hasext = 1;
        }
 
-#if defined(CONFIG_SYS_U_BOOT_OFFS)
-       if (headersz > CONFIG_SYS_U_BOOT_OFFS) {
-               fprintf(stderr,
-                       "Error: Image header (incl. SPL image) too big!\n");
-               fprintf(stderr, "header=0x%x CONFIG_SYS_U_BOOT_OFFS=0x%x!\n",
-                       (int)headersz, CONFIG_SYS_U_BOOT_OFFS);
-               fprintf(stderr, "Increase CONFIG_SYS_U_BOOT_OFFS!\n");
-               return 0;
-       }
-
-       headersz = CONFIG_SYS_U_BOOT_OFFS;
-#endif
-
        /*
         * The payload should be aligned on some reasonable
         * boundary