From patchwork Fri Aug 15 23:51:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan Wu X-Patchwork-Id: 380440 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id BDF621400DE for ; Sat, 16 Aug 2014 09:52:06 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9D0804B661; Sat, 16 Aug 2014 01:52:02 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kNBc-HMVJ1AX; Sat, 16 Aug 2014 01:52:02 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AB4574B656; Sat, 16 Aug 2014 01:52:00 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5C9A44B657 for ; Sat, 16 Aug 2014 01:51:58 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uFiAuoyJb3OP for ; Sat, 16 Aug 2014 01:51:55 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by theia.denx.de (Postfix) with ESMTPS id B46814B655 for ; Sat, 16 Aug 2014 01:51:50 +0200 (CEST) Received: by mail-pa0-f42.google.com with SMTP id lf10so4309688pab.29 for ; Fri, 15 Aug 2014 16:51:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=sPjk9ZstzjJQ8A+G6TUE5bh53tC4RuWiIf736gowEnA=; b=lZWKhgvE+27Q+UVy2PYubTRBXC3fe/o5g0vLLhUvlDZe1t7J50q62goyM2QYUuWNpf JWCsFGBNa6jdwucMigX7AsNgBJzesdg372Bq2ZpPtgXF/hZoz2vW0f58rWoSWuooWXuT ipOsX0XOeqHXhnajeirGbC4M3oaDcUYTxI6Ei6Qx/o8BxDAJuj5+87peRz+E+TX0BNtK cjdcouFxZVMfATftuBgzZWXCOK+mZQT3Djex8IQazjnH2k+AfzQZer3sQHTff36U4QYz zrM/1lUKaudaUnvVmym5tUt+G5GNfGG5iHPZi7bzUTP5tGaXjBTfruENGFz0XRV+Xw8R /2ig== X-Received: by 10.68.215.106 with SMTP id oh10mr16243730pbc.98.1408146708440; Fri, 15 Aug 2014 16:51:48 -0700 (PDT) Received: from localhost (thunderhill.nvidia.com. [216.228.112.22]) by mx.google.com with ESMTPSA id bu2sm9049862pbc.19.2014.08.15.16.51.46 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 15 Aug 2014 16:51:47 -0700 (PDT) From: Bryan Wu X-Google-Original-From: Bryan Wu To: sjg@chromium.org, trini@ti.com, swarren@wwwdotorg.org, u-boot@lists.denx.de, yorksun@freescale.com Date: Fri, 15 Aug 2014 16:51:38 -0700 Message-Id: <1408146699-27959-1-git-send-email-pengw@nvidia.com> X-Mailer: git-send-email 1.9.1 Subject: [U-Boot] [PATCH v3 1/2] image: fix bootm failure for FIT image X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Commit b3dd64f5d537 "bootm: use genimg_get_kernel_addr()" introduced a bug for booting FIT image. It's because calling fit_parse_config() twice will give us wrong value in img_addr. Add a new function genimg_get_kernel_addr_fit() whichl will always return fit_uname_config and fit_uname_kernel for CONFIG_FIT. genimg_get_kernel_addr() will ignore those to parameters. Reported-by: York Sun Signed-off-by: Bryan Wu --- common/bootm.c | 9 +++------ common/image.c | 39 +++++++++++++++++++++++++++------------ include/image.h | 3 +++ 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/common/bootm.c b/common/bootm.c index 76d811c..245c82a 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -725,13 +725,14 @@ static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc, #endif ulong img_addr; const void *buf; -#if defined(CONFIG_FIT) const char *fit_uname_config = NULL; const char *fit_uname_kernel = NULL; +#if defined(CONFIG_FIT) int os_noffset; #endif - img_addr = genimg_get_kernel_addr(argv[0]); + img_addr = genimg_get_kernel_addr_fit(argv[0], &fit_uname_config, + &fit_uname_kernel); bootstage_mark(BOOTSTAGE_ID_CHECK_MAGIC); @@ -788,10 +789,6 @@ static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc, #endif #if defined(CONFIG_FIT) case IMAGE_FORMAT_FIT: - if (!fit_parse_conf(argv[0], load_addr, &img_addr, - &fit_uname_config)) - fit_parse_subimage(argv[0], load_addr, &img_addr, - &fit_uname_kernel); os_noffset = fit_image_load(images, img_addr, &fit_uname_kernel, &fit_uname_config, IH_ARCH_DEFAULT, IH_TYPE_KERNEL, diff --git a/common/image.c b/common/image.c index a2999c0..d4ccff0 100644 --- a/common/image.c +++ b/common/image.c @@ -643,22 +643,24 @@ int genimg_get_comp_id(const char *name) #ifndef USE_HOSTCC /** - * genimg_get_kernel_addr - get the real kernel address + * genimg_get_kernel_addr_fit - get the real kernel address and return 2 + * FIT strings * @img_addr: a string might contain real image address + * @fit_uname_config: double pointer to a char, will hold pointer to a + * configuration unit name + * @fit_uname_kernel: double pointer to a char, will hold pointer to a subimage + * name * - * genimg_get_kernel_addr() get the real kernel start address from a string + * genimg_get_kernel_addr_fit get the real kernel start address from a string * which is normally the first argv of bootm/bootz * * returns: * kernel start address */ -ulong genimg_get_kernel_addr(char * const img_addr) +ulong genimg_get_kernel_addr_fit(char * const img_addr, + const char **fit_uname_config, + const char **fit_uname_kernel) { -#if defined(CONFIG_FIT) - const char *fit_uname_config = NULL; - const char *fit_uname_kernel = NULL; -#endif - ulong kernel_addr; /* find out kernel image address */ @@ -668,13 +670,13 @@ ulong genimg_get_kernel_addr(char * const img_addr) load_addr); #if defined(CONFIG_FIT) } else if (fit_parse_conf(img_addr, load_addr, &kernel_addr, - &fit_uname_config)) { + fit_uname_config)) { debug("* kernel: config '%s' from image at 0x%08lx\n", - fit_uname_config, kernel_addr); + *fit_uname_config, kernel_addr); } else if (fit_parse_subimage(img_addr, load_addr, &kernel_addr, - &fit_uname_kernel)) { + fit_uname_kernel)) { debug("* kernel: subimage '%s' from image at 0x%08lx\n", - fit_uname_kernel, kernel_addr); + *fit_uname_kernel, kernel_addr); #endif } else { kernel_addr = simple_strtoul(img_addr, NULL, 16); @@ -686,6 +688,19 @@ ulong genimg_get_kernel_addr(char * const img_addr) } /** + * genimg_get_kernel_addr() is the simple version of + * genimg_get_kernel_addr_fit(). It ignores those return FIT strings + */ +ulong genimg_get_kernel_addr(char * const img_addr) +{ + const char *fit_uname_config = NULL; + const char *fit_uname_kernel = NULL; + + return genimg_get_kernel_addr_fit(img_addr, &fit_uname_config, + &fit_uname_kernel); +} + +/** * genimg_get_format - get image format type * @img_addr: image start address * diff --git a/include/image.h b/include/image.h index ca2fe86..69f86ad 100644 --- a/include/image.h +++ b/include/image.h @@ -424,6 +424,9 @@ enum fit_load_op { #define IMAGE_FORMAT_FIT 0x02 /* new, libfdt based format */ #define IMAGE_FORMAT_ANDROID 0x03 /* Android boot image */ +ulong genimg_get_kernel_addr_fit(char * const img_addr, + const char **fit_uname_config, + const char **fit_uname_kernel); ulong genimg_get_kernel_addr(char * const img_addr); int genimg_get_format(const void *img_addr); int genimg_has_config(bootm_headers_t *images);