From patchwork Wed Sep 23 17:25:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harkin X-Patchwork-Id: 54064 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id 04B3F22E14 for ; Wed, 23 Sep 2015 17:27:38 +0000 (UTC) Received: by wicgb1 with SMTP id gb1sf28350541wic.3 for ; Wed, 23 Sep 2015 10:27:37 -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=ZnCkOuKOzb2nGB90QztvrBuR2Xa7otanOhV+Rs7WXTQ=; b=OlzKdCItFT0UhZTo3IqHPdxXakL8ADJ1T3gpwhI6SuUDfRemq6nnGdmCvpd/WeYM3i M4bz5Tq630zBtDJbIB8lRYa76kIEGoBnXYryslF1aP9pTaZouiSo8uT1j6BbYn6bpszr icLItQ/k+jfrJ2VisdFmI62uEer9dPi9othkO+yzae3pcqGYeSvqhXEqFT2oP8GbtPrA vRhUy55qvE/3XlhVRasJWxxfHIr3fA7Sz1lljmtr2BESPQLHkhiGoz/NMtKNTdCOIy6y w1O5nbGb2bNa83FTIoA7bhNWnkUmzuzWbdmiO5n5BFyPnP8iAZcMrX15vs0tO5QK27nc LfkQ== X-Gm-Message-State: ALoCoQlXkKdC99osXTGCVs6KRmQeXv1ZQHK4XZF5uLkg+DXdJajU++Za6saIk0OFTnVR+Iujw9fs X-Received: by 10.112.209.73 with SMTP id mk9mr2451112lbc.14.1443029257297; Wed, 23 Sep 2015 10:27:37 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.19.223 with SMTP id 92ls136191lft.101.gmail; Wed, 23 Sep 2015 10:27:37 -0700 (PDT) X-Received: by 10.25.151.205 with SMTP id z196mr4100999lfd.97.1443029257164; Wed, 23 Sep 2015 10:27:37 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id od3si2651294lbb.76.2015.09.23.10.27.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Sep 2015 10:27:37 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by lahh2 with SMTP id h2so35232561lah.0 for ; Wed, 23 Sep 2015 10:27:37 -0700 (PDT) X-Received: by 10.25.205.198 with SMTP id d189mr4149824lfg.72.1443029257056; Wed, 23 Sep 2015 10:27:37 -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 w3csp23553lbq; Wed, 23 Sep 2015 10:27:36 -0700 (PDT) X-Received: by 10.180.184.201 with SMTP id ew9mr5569609wic.53.1443029256460; Wed, 23 Sep 2015 10:27:36 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id ia5si9622563wjb.61.2015.09.23.10.27.36; Wed, 23 Sep 2015 10:27:36 -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 5E1ED4B6D1; Wed, 23 Sep 2015 19:27: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 SNrzM4WfronG; Wed, 23 Sep 2015 19:27:33 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 74F224B95C; Wed, 23 Sep 2015 19:27:26 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8C3CB4B78D for ; Wed, 23 Sep 2015 19:27:18 +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 cPUW6Rlt581c for ; Wed, 23 Sep 2015 19:27:18 +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-f46.google.com (mail-pa0-f46.google.com [209.85.220.46]) by theia.denx.de (Postfix) with ESMTPS id 2168B4B943 for ; Wed, 23 Sep 2015 19:27:14 +0200 (CEST) Received: by pacfv12 with SMTP id fv12so46733769pac.2 for ; Wed, 23 Sep 2015 10:27:13 -0700 (PDT) X-Received: by 10.68.57.197 with SMTP id k5mr38470687pbq.142.1443029233503; Wed, 23 Sep 2015 10:27:13 -0700 (PDT) Received: from localhost.localdomain ([70.35.39.2]) by smtp.gmail.com with ESMTPSA id fm5sm9061765pab.24.2015.09.23.10.27.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Sep 2015 10:27:13 -0700 (PDT) From: Ryan Harkin To: ryan.harkin@linaro.org, u-boot@lists.denx.de, Albert Aribaud , Tom Rini Date: Wed, 23 Sep 2015 10:25:40 -0700 Message-Id: <1443029143-22313-9-git-send-email-ryan.harkin@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1443029143-22313-1-git-send-email-ryan.harkin@linaro.org> References: <1443029143-22313-1-git-send-email-ryan.harkin@linaro.org> Cc: Steve Rae Subject: [U-Boot] [PATCH 08/11] 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.215.43 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 CC: 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; }