From patchwork Tue Sep 29 15:47:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harkin X-Patchwork-Id: 523929 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 8027A14029C for ; Wed, 30 Sep 2015 01:48:48 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A7B994B910; Tue, 29 Sep 2015 17:48:33 +0200 (CEST) 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 0hrl15Q3vL5j; Tue, 29 Sep 2015 17:48:33 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 36D944B8D1; Tue, 29 Sep 2015 17:48:03 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 36ECF4B8D6 for ; Tue, 29 Sep 2015 17:47:49 +0200 (CEST) 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 AM71mnoozpMP for ; Tue, 29 Sep 2015 17:47:49 +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-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by theia.denx.de (Postfix) with ESMTPS id 0E8ED4B8DB for ; Tue, 29 Sep 2015 17:47:43 +0200 (CEST) Received: by wicgb1 with SMTP id gb1so155416636wic.1 for ; Tue, 29 Sep 2015 08:47:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dCiGiFOHw8tEUqog99OIyh22pY6Vjk6Ok1bTCaSLDfs=; b=ZgGNv8rZmY9tvIdaPBhChS3QWu3th/C/ztOOmQYIo2ahbDxOKuYxxODyhyOUfP9olQ toDvrw8vwCkAQQ4/e685/KpjDYuJgdP3sXSPMcgfIkkUkLVZtL8Jh1NYbhputgxc+J1n 7MsifNXPxi+NIsdPgmF/KI6mbwm1WusbCFuGP/WCjaG1Wezf/eDu2ji6ykMhgkp4TEWX udoZWM5LRqcomzFn/awNg85FQCtXBLVIUsfFmTpsepomdAwhPRxPCRRPfrqrGSLVhfVd R3zl+tkw2n36L991cAYkSDO2znZF7kqurWQwlQ0Azubl5JJap8YK2TGr63l7mgfhEsrj dSVA== X-Gm-Message-State: ALoCoQnzRaf/RvtG7f6+Kbv3BAVz3Nu/uXNO+wTxJFkH+NrNOUuS59sM8SQ8jo+5kVGokXHVn3Ep X-Received: by 10.180.198.142 with SMTP id jc14mr27198878wic.32.1443541662888; Tue, 29 Sep 2015 08:47:42 -0700 (PDT) Received: from localhost.localdomain (82-69-54-187.dsl.in-addr.zen.co.uk. [82.69.54.187]) by smtp.gmail.com with ESMTPSA id kb9sm24555824wjb.49.2015.09.29.08.47.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Sep 2015 08:47:42 -0700 (PDT) From: Ryan Harkin To: ryan.harkin@linaro.org, u-boot@lists.denx.de, Albert Aribaud , Tom Rini Date: Tue, 29 Sep 2015 16:47:17 +0100 Message-Id: <1443541640-7810-8-git-send-email-ryan.harkin@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1443541640-7810-1-git-send-email-ryan.harkin@linaro.org> References: <1443541640-7810-1-git-send-email-ryan.harkin@linaro.org> Cc: Steve Rae Subject: [U-Boot] [PATCH v2 07/10] common/armflash: load_image returns success or failure X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Change the load_image so that it returns success or failure of the command (using CMD_RET_SUCCESS or CMD_RET_FAILURE). This way, hush scripts can optionally load different files depending upon the system configuration. A simple example: if afs load ${kernel_name} ${kernel_addr}; then echo loaded; else echo \ not loaded; fi Signed-off-by: Ryan Harkin Reviewed-by: Linus Walleij --- common/cmd_armflash.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/common/cmd_armflash.c b/common/cmd_armflash.c index a37f5c4..02b7fee 100644 --- a/common/cmd_armflash.c +++ b/common/cmd_armflash.c @@ -175,7 +175,7 @@ static void parse_flash(void) parse_bank(bank); } -static void load_image(const char * const name, const ulong address) +static int load_image(const char * const name, const ulong address) { struct afs_image *afi = NULL; int i; @@ -191,7 +191,7 @@ static void load_image(const char * const name, const ulong address) } if (!afi) { printf("image \"%s\" not found in flash\n", name); - return; + return CMD_RET_FAILURE; } for (i = 0; i < afi->region_count; i++) { @@ -215,6 +215,7 @@ static void load_image(const char * const name, const ulong address) to, afi->regions[i].size); } + return CMD_RET_SUCCESS; } static void print_images(void) @@ -274,12 +275,12 @@ static int do_afs(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } else if (argc == 3 && !strcmp(argv[1], "exists")) { ret = exists(argv[2]); } else if (argc == 3 && !strcmp(argv[1], "load")) { - load_image(argv[2], 0x0); + ret = load_image(argv[2], 0x0); } else if (argc == 4 && !strcmp(argv[1], "load")) { ulong load_addr; load_addr = simple_strtoul(argv[3], NULL, 16); - load_image(argv[2], load_addr); + ret = load_image(argv[2], load_addr); } else { return CMD_RET_USAGE; }