From patchwork Tue Sep 29 15:47:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harkin X-Patchwork-Id: 54241 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by patches.linaro.org (Postfix) with ESMTPS id 3FDA822EAF for ; Tue, 29 Sep 2015 15:49:01 +0000 (UTC) Received: by labnm6 with SMTP id nm6sf6685604lab.1 for ; Tue, 29 Sep 2015 08:49:00 -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=Wma+yL2tNLo/yhlxwMyIC5FmNprFSRONm1GNR2bCKro=; b=OEXkBAWuBiZRfc7IfcJ/WEeVN94Ie7dCsiKji8VKIlJOUxSOa48FpllKsCqu39eeId OUoYszRjGK/PFUoMbufvWxwNZhA+Fdkr1LUosCGNgp4VljRjaGVctLtwIF/GAQUJBCJv Ue/ZV/bAMOdsYqBAHzMFeJt3OIg8Qhdk6DNNbIhIk1R5Dix2BJOYA37Xl18KrbHtX7FI jPpzRvLvaVuz5djnZt+lx9JI/WuPl09VO3dDUO6jM7rHBxJBkcL81kh26Fa/APVqn97b oOTJDpLpoYBs7/Ti3Rf27bHzBpT03q04EPxkPPTAFLEFO2w5wvV+uyeC+mnwO+cmY263 BdQQ== X-Gm-Message-State: ALoCoQn5oMTP5Q4p/TkV71bAbJOaKTNbTvfyB/yy4wFcJV84x5Bq3s/PPHQT1pGf6qUyA5AOUqIY X-Received: by 10.112.138.170 with SMTP id qr10mr4494845lbb.4.1443541740096; Tue, 29 Sep 2015 08:49:00 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.18.137 with SMTP id w9ls324597lad.93.gmail; Tue, 29 Sep 2015 08:48:59 -0700 (PDT) X-Received: by 10.25.32.143 with SMTP id g137mr5024911lfg.94.1443541739959; Tue, 29 Sep 2015 08:48:59 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id c20si11228080lfb.26.2015.09.29.08.48.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2015 08:48:59 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by labzv5 with SMTP id zv5so14033056lab.1 for ; Tue, 29 Sep 2015 08:48:59 -0700 (PDT) X-Received: by 10.25.19.73 with SMTP id j70mr4971416lfi.29.1443541739816; Tue, 29 Sep 2015 08:48:59 -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 w3csp2224399lbq; Tue, 29 Sep 2015 08:48:58 -0700 (PDT) X-Received: by 10.180.37.113 with SMTP id x17mr24396528wij.33.1443541738861; Tue, 29 Sep 2015 08:48:58 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id y3si30178943wie.41.2015.09.29.08.48.58; Tue, 29 Sep 2015 08:48:58 -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 C43A54B915; Tue, 29 Sep 2015 17:48:39 +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 5gkSw_p-Me1H; Tue, 29 Sep 2015 17:48:39 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3E2144B919; Tue, 29 Sep 2015 17:48:05 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 018264B8DE 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 MUBXIgDVnMVS for ; Tue, 29 Sep 2015 17:47:48 +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 7CB734B8D6 for ; Tue, 29 Sep 2015 17:47:42 +0200 (CEST) Received: by wicge5 with SMTP id ge5so156735581wic.0 for ; Tue, 29 Sep 2015 08:47:42 -0700 (PDT) X-Received: by 10.180.11.165 with SMTP id r5mr26717144wib.43.1443541661868; Tue, 29 Sep 2015 08:47:41 -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.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Sep 2015 08:47:41 -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:16 +0100 Message-Id: <1443541640-7810-7-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 06/10] common/armflash: add command to check if image exists 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.54 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 Add a command to the ARM flash support to check if an image exists or not. If the image is found, it will return CMD_RET_SUCCESS, else CMD_RET_FAILURE. This allows hush scripts to conditionally load images. A simple example: if afs exists ${kernel_name}; then echo found; else echo \ not found; fi Signed-off-by: Ryan Harkin Reviewed-by: Linus Walleij --- common/cmd_armflash.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/common/cmd_armflash.c b/common/cmd_armflash.c index 1db92b0..a37f5c4 100644 --- a/common/cmd_armflash.c +++ b/common/cmd_armflash.c @@ -251,10 +251,28 @@ static void print_images(void) } } +static int exists(const char * const name) +{ + int i; + + parse_flash(); + for (i = 0; i < num_afs_images; i++) { + struct afs_image *afi = &afs_images[i]; + + if (strcmp(afi->name, name) == 0) + return CMD_RET_SUCCESS; + } + return CMD_RET_FAILURE; +} + static int do_afs(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { + int ret = CMD_RET_SUCCESS; + if (argc == 1) { print_images(); + } 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); } else if (argc == 4 && !strcmp(argv[1], "load")) { @@ -266,12 +284,14 @@ static int do_afs(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return CMD_RET_USAGE; } - return 0; + return ret; } U_BOOT_CMD(afs, 4, 0, do_afs, "show AFS partitions", "no arguments\n" " - list images in flash\n" + "exists \n" + " - returns 1 if an image exists, else 0\n" "load \n" " - load an image to the location indicated in the header\n" "load 0x
\n"