From patchwork Thu Oct 1 17:43:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harkin X-Patchwork-Id: 525211 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 A1B36140D6D for ; Fri, 2 Oct 2015 03:45:05 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 46BF84B9A5; Thu, 1 Oct 2015 19:44:30 +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 gdB3KF8m2kzU; Thu, 1 Oct 2015 19:44:30 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C6AC64B9BC; Thu, 1 Oct 2015 19:44:09 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E77904B95B for ; Thu, 1 Oct 2015 19:44:03 +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 CYor08-MayC6 for ; Thu, 1 Oct 2015 19:44:03 +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-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by theia.denx.de (Postfix) with ESMTPS id B19F84B992 for ; Thu, 1 Oct 2015 19:43:52 +0200 (CEST) Received: by wiclk2 with SMTP id lk2so61503wic.1 for ; Thu, 01 Oct 2015 10:43:51 -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=Vp1mN8osx3tdP1m9/C8ZXcKOOIrl9yaraqRcaL2eHp0=; b=mqI27Fxjr9oOERxQUr2Q5VhFExKiGu7HslFB7F5AOl3y+Q0TDlFsc/kiF2Ko98Zs7/ 8NaxQamtwXTj+eq+8HEOg1QF4BzmwB/WaGqmYJgtzsY6kQUB46KweDF54vOqLt/Yjv39 4YjB46qVa2sIXRSCkjPLxUariNWUhoDkSC65HEmWmsMiTfNGtXV/zr3ZF+qyiRXV0mgY fBsZmpT5qkiKe3WoKr/b2EBCqzQ+qAup5HEQbrWPzE756YD+8i5bdDSoBLtcjQp814jG 57zsrROAS0VzVtMACzp3IRm1eouOjARwD8ODUBxQugAPDTCAqp/TBPzhtFTg5AtM89n+ t5ww== X-Gm-Message-State: ALoCoQkzL+S4cGahD8rcAIGyP1x5GbR85NVCvvR1iAULFEoBks4aBcKodP9WVqqWtXu1hMtK6Jxs X-Received: by 10.180.198.178 with SMTP id jd18mr78891wic.34.1443721431817; Thu, 01 Oct 2015 10:43:51 -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 xt1sm7198426wjb.32.2015.10.01.10.43.50 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Oct 2015 10:43:51 -0700 (PDT) From: Ryan Harkin To: ryan.harkin@linaro.org, u-boot@lists.denx.de, Albert Aribaud , Tom Rini Date: Thu, 1 Oct 2015 18:43:33 +0100 Message-Id: <1443721416-725-8-git-send-email-ryan.harkin@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1443721416-725-1-git-send-email-ryan.harkin@linaro.org> References: <1443721416-725-1-git-send-email-ryan.harkin@linaro.org> Cc: Steve Rae Subject: [U-Boot] [PATCH v3 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 CC: Linus Walleij --- common/cmd_armflash.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/common/cmd_armflash.c b/common/cmd_armflash.c index a37f5c4..af453f7 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++) { @@ -204,7 +204,7 @@ static void load_image(const char * const name, const ulong address) to = afi->regions[i].load_address; } else { printf("no valid load address\n"); - return; + return CMD_RET_FAILURE; } memcpy((void *)to, (void *)from, afi->regions[i].size); @@ -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; }