From patchwork Thu Oct 1 17:43:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harkin X-Patchwork-Id: 54393 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 9BC9F23009 for ; Thu, 1 Oct 2015 17:44:55 +0000 (UTC) Received: by labjk1 with SMTP id jk1sf40216886lab.0 for ; Thu, 01 Oct 2015 10:44:54 -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=CsKZKTWojcGGlghkZLg64zro+0Z848FfKSG0+v2kQIU=; b=M14MbxbmTCwxKczuVmVLjI709TyfGpO28OZxQQUoS8nw41h9j1pR70m67h2Dsjddk3 SIAWi/o6U6NTBwUS6wuwjyAL7bfdGLRx4hxS0c4DL/b8CpMszZuZWDnoRIUpvMXjXF4V nLKj5bjrAPw1oW8Peb6DTmITL1/qRkc2+DkXJZ8AoRz9jXI19qgmWiYV8dtczVwujxmh 6G7TxkwV5tG6ztOG9UIjRtMul6QWOUe0ZvQ5/XGl5T1+Z7oS0F+HjTNdUIdTIdaGqmy4 wVVc4TM6GCo0iHcOIEVZJJGAAcjgINrFH/8VauBURtTpMTh5r0+I0E3245GDcI8/KM7g 1xTg== X-Gm-Message-State: ALoCoQn87mhYgBd1VSjJ5qIf9R+Az1cqEoXSyCGD/8nl+gSKtV8iDKSY+d3O9Jr9wq+u5t/TyQn9 X-Received: by 10.112.54.197 with SMTP id l5mr1635827lbp.21.1443721494171; Thu, 01 Oct 2015 10:44:54 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.23.155 with SMTP id 27ls142278lfx.49.gmail; Thu, 01 Oct 2015 10:44:54 -0700 (PDT) X-Received: by 10.112.169.98 with SMTP id ad2mr3434416lbc.2.1443721494005; Thu, 01 Oct 2015 10:44:54 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id p4si3443313lbw.11.2015.10.01.10.44.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Oct 2015 10:44:53 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by lbcao8 with SMTP id ao8so13671883lbc.3 for ; Thu, 01 Oct 2015 10:44:53 -0700 (PDT) X-Received: by 10.112.130.70 with SMTP id oc6mr3584636lbb.32.1443721493706; Thu, 01 Oct 2015 10:44:53 -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 w3csp746592lbq; Thu, 1 Oct 2015 10:44:53 -0700 (PDT) X-Received: by 10.180.73.104 with SMTP id k8mr55224wiv.90.1443721493021; Thu, 01 Oct 2015 10:44:53 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id fh7si3928950wib.101.2015.10.01.10.44.52; Thu, 01 Oct 2015 10:44:53 -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 7BFB64B9F3; Thu, 1 Oct 2015 19:44:26 +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 t0wCWX6eqLIH; Thu, 1 Oct 2015 19:44:26 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8FEF34B99D; Thu, 1 Oct 2015 19:44:07 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 920BF4B9B4 for ; Thu, 1 Oct 2015 19:44:01 +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 5FR_04X7HDBs for ; Thu, 1 Oct 2015 19:44:01 +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-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by theia.denx.de (Postfix) with ESMTPS id 617EA4B991 for ; Thu, 1 Oct 2015 19:43:51 +0200 (CEST) Received: by wiclk2 with SMTP id lk2so1516123wic.0 for ; Thu, 01 Oct 2015 10:43:50 -0700 (PDT) X-Received: by 10.180.39.175 with SMTP id q15mr22823wik.73.1443721430744; Thu, 01 Oct 2015 10:43:50 -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.49 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Oct 2015 10:43:50 -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:32 +0100 Message-Id: <1443721416-725-7-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 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.217.170 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 CC: David Feng CC: Bhupesh Sharma CC: 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"