kwbimage: Rename CONFIG_SYS_SPI_U_BOOT_OFFS to CONFIG_SYS_U_BOOT_OFFS

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 <sr@denx.de>
Cc: Luka Perkov <luka.perkov@sartura.hr>
Cc: Dirk Eibach <eibach@gdsys.de>

diff --git a/tools/Makefile b/tools/Makefile
index 462cd598c29c2aeaabb893ae0bce76800b1a5489..2680a7778f39faf88734a24d669d876d55e970cf 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -117,8 +117,8 @@ ifdef CONFIG_FIT_SIGNATURE
 HOST_EXTRACFLAGS       += -DCONFIG_FIT_SIGNATURE
 endif
 
-ifdef CONFIG_SYS_SPI_U_BOOT_OFFS
-HOSTCFLAGS_kwbimage.o += -DCONFIG_SYS_SPI_U_BOOT_OFFS=$(CONFIG_SYS_SPI_U_BOOT_OFFS)
+ifdef CONFIG_SYS_U_BOOT_OFFS
+HOSTCFLAGS_kwbimage.o += -DCONFIG_SYS_U_BOOT_OFFS=$(CONFIG_SYS_U_BOOT_OFFS)
 endif
 
 # MXSImage needs LibSSL

diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index 91e0990ad6b9b2833bfacaab781b378e033d9a07..3fa90d3a758ab407206773fa3fd932d696794a8d 100644 (file)
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -421,15 +421,15 @@ 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) {
+#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_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");
+               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;
        } else {
-               headersz = CONFIG_SYS_SPI_U_BOOT_OFFS;
+               headersz = CONFIG_SYS_U_BOOT_OFFS;
        }
 #endif