| Message ID | 1437384040-16244-3-git-send-email-sr@denx.de |
|---|---|
| State | Accepted |
| Delegated to: | Stefan Roese |
| Headers | show |
Hello Stefan, On Mon, 20 Jul 2015 11:20:38 +0200, Stefan Roese <sr@denx.de> wrote: > 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. Hmm, what if SPL gets support for booting from several sources with different U-Boot offsets for different sources? Amicalement,
Hi Albert, On 21.07.2015 09:37, Albert ARIBAUD wrote: > On Mon, 20 Jul 2015 11:20:38 +0200, Stefan Roese <sr@denx.de> wrote: >> 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. > > Hmm, what if SPL gets support for booting from several sources with > different U-Boot offsets for different sources? If this happens then lets deal with it. For now I prefer to not add a new define / macro, if the current one can handle both supported cases. Thanks, Stefan
diff --git a/tools/Makefile b/tools/Makefile index 8ff9c2e..5d14a34 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -116,8 +116,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
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> --- tools/Makefile | 4 ++-- tools/kwbimage.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-)