From patchwork Fri Oct 9 16:18:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harkin X-Patchwork-Id: 54715 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by patches.linaro.org (Postfix) with ESMTPS id 80DCF22DB6 for ; Fri, 9 Oct 2015 16:19:06 +0000 (UTC) Received: by lbbti1 with SMTP id ti1sf42441275lbb.3 for ; Fri, 09 Oct 2015 09:19:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list; bh=Bf9Oe61YWJwVkrqAi0Lx4mz5vdbcXM17Kc5gN08WZTY=; b=hd3KAQAESG2LSSsVjl5URrjy27wreGLG5lT2VBvuE1QRdX3MNcJOgWg9uRbJzXGJft e8mRpa4RZVbCucog5Iucwv7t3Dv6UqMddqr4j5NpjxRQz7iRg6r1lrZm5zyu+Ff8O4GF pryu2VgZnQmyb7ATyl6PSb9hyUNYLXzHY2P4v5SZP0VsaUcNqFiSK2IkICG/MxdwzlG+ 1h5AuSE5KwDHNSaDahbWsgowpsSseFmwywlkBOHil3cFHZzLCq2iuvioy3TSUUbC7FsM GQRkj1VK3MD4M1odaI4n6YNdlMIjh4yWQ1+zSN95S2+RxxV2Yf728w7fvd5jvf5kMaXZ FLSQ== X-Gm-Message-State: ALoCoQm+zlCb+VxjYFioJE3OIqnBUNeC1pSpKJyeO1zH8OlNuVy3mtfiuRPEVUCKlKnSo6HtJqVL X-Received: by 10.112.198.33 with SMTP id iz1mr2763606lbc.8.1444407545426; Fri, 09 Oct 2015 09:19:05 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.89.207 with SMTP id n198ls298099lfb.54.gmail; Fri, 09 Oct 2015 09:19:05 -0700 (PDT) X-Received: by 10.112.16.67 with SMTP id e3mr6992860lbd.5.1444407545274; Fri, 09 Oct 2015 09:19:05 -0700 (PDT) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com. [209.85.217.180]) by mx.google.com with ESMTPS id uk7si1720977lbc.164.2015.10.09.09.19.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Oct 2015 09:19:05 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by lbos8 with SMTP id s8so85376257lbo.0 for ; Fri, 09 Oct 2015 09:19:05 -0700 (PDT) X-Received: by 10.25.40.130 with SMTP id o124mr4471545lfo.41.1444407545145; Fri, 09 Oct 2015 09:19:05 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp84503lbq; Fri, 9 Oct 2015 09:19:04 -0700 (PDT) X-Received: by 10.194.63.5 with SMTP id c5mr15041376wjs.127.1444407544458; Fri, 09 Oct 2015 09:19:04 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id hs10si19487745wib.46.2015.10.09.09.19.04; Fri, 09 Oct 2015 09:19:04 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3CFA64B87C; Fri, 9 Oct 2015 18:19: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 7PEnc8uIbeY8; Fri, 9 Oct 2015 18:19:03 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DFC2B4B8C9; Fri, 9 Oct 2015 18:18:48 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 937514B88E for ; Fri, 9 Oct 2015 18:18:27 +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 bmgOMMB-00Iq for ; Fri, 9 Oct 2015 18:18:27 +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-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by theia.denx.de (Postfix) with ESMTPS id 1B2154B892 for ; Fri, 9 Oct 2015 18:18:27 +0200 (CEST) Received: by wiclk2 with SMTP id lk2so77542352wic.0 for ; Fri, 09 Oct 2015 09:18:26 -0700 (PDT) X-Received: by 10.180.208.42 with SMTP id mb10mr143526wic.60.1444407506852; Fri, 09 Oct 2015 09:18:26 -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 bf8sm2942173wjc.22.2015.10.09.09.18.25 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Oct 2015 09:18:26 -0700 (PDT) From: Ryan Harkin To: ryan.harkin@linaro.org, u-boot@lists.denx.de, Albert Aribaud , Tom Rini Date: Fri, 9 Oct 2015 17:18:05 +0100 Message-Id: <1444407488-32646-8-git-send-email-ryan.harkin@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1444407488-32646-1-git-send-email-ryan.harkin@linaro.org> References: <1444407488-32646-1-git-send-email-ryan.harkin@linaro.org> Cc: Steve Rae Subject: [U-Boot] [PATCH v4 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: 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" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ryan.harkin@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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 | 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; }