diff options
| author | Stefan Roese <sr@denx.de> | 2015-07-20 11:20:38 +0200 |
|---|---|---|
| committer | Luka Perkov <luka.perkov@sartura.hr> | 2015-07-24 09:46:21 +0200 |
| commit | 7ddf8cfb0ddc16c49adeee574ae5945c21790e1a (patch) | |
| tree | 3066807b3a8d54bfed388d6391fe31a636159f14 | |
| parent | 1bbe63c3f2b88cbe07c62c801d648d1d82b09d2e (diff) | |
| download | u-boot-imx-7ddf8cfb0ddc16c49adeee574ae5945c21790e1a.zip u-boot-imx-7ddf8cfb0ddc16c49adeee574ae5945c21790e1a.tar.gz u-boot-imx-7ddf8cfb0ddc16c49adeee574ae5945c21790e1a.tar.bz2 | |
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>
| -rw-r--r-- | tools/Makefile | 4 | ||||
| -rw-r--r-- | tools/kwbimage.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tools/Makefile b/tools/Makefile index 98414f7..db55bcf 100644 --- 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 91e0990..3fa90d3 100644 --- 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 |