From patchwork Fri Mar 30 14:18:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 893358 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="ZpuLwIVf"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40CP571rfrz9sX8 for ; Sat, 31 Mar 2018 01:24:27 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id EE89AC21E96; Fri, 30 Mar 2018 14:22:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 50942C2226A; Fri, 30 Mar 2018 14:20:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F08EEC22273; Fri, 30 Mar 2018 14:19:08 +0000 (UTC) Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by lists.denx.de (Postfix) with ESMTPS id 32ABAC22245 for ; Fri, 30 Mar 2018 14:19:04 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id f125so16960027wme.4 for ; Fri, 30 Mar 2018 07:19:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8Mgg/MIYIwez2JZu4bkQx7bPGQ99wt2UA7NEJcVK+K8=; b=ZpuLwIVfspiJekOadxpGoz0hEPji3YKR1hz7uq/ZMr7CfHNH+of0dA/Vxifi3lK2W2 P8bPSpvCznh+BiZcRXBKVM/+4l+V43zr2Y1namR/aSCb4oFAEgjlYl5LoEw2Z74zIvvN lDYki7TBLZog8VAoWTXo4SGWQ90mRqJvy7tLM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8Mgg/MIYIwez2JZu4bkQx7bPGQ99wt2UA7NEJcVK+K8=; b=N+fLFZJTzRVzCXx+WLhL0Kpfdp/bxKQNLngyIOBj0zJPSvJcacxl5Y2XRbnMcK04Tv WnYmy02MyBhKra/Dc/YH+pLgst+PWnR4efveEldcL8zufQtW8zmQmtAUMDzFQCJrFGZK 866fz40CDjrg+wRPoa5tjZjJucQuoNArbVMOToOzrR4CyJGOgywc/7bZWBCAJxFKwQ0d LhX/ybQuRyOcnebgibsAM5RG8VBTr66+BVXQ51lSTscP6e1fKNWx2jISw9BzEDiImV1+ q8qrR6bIl3Q8sD2EYef5XPwCNu4HjZMoowKr6dWF2weRK9iUFEVO6yoGfuksdxG6xihj b2BA== X-Gm-Message-State: AElRT7GJlALgD0KAQ/i9xiOMjbaSSFU/iGNoACHYW80oui7uF2GEl/2n RtBWCoc90XqTYvZh4O2BEToaNnTXV+Q= X-Google-Smtp-Source: AIpwx48KhmoqEIFluRuzvdHaRRtb3dfHtLm6nilMw57gzXbHrLZNzxEiFfsrlXAj2bu/S2dTQ0PjnA== X-Received: by 10.80.145.49 with SMTP id e46mr3141997eda.252.1522419543726; Fri, 30 Mar 2018 07:19:03 -0700 (PDT) Received: from localhost.localdomain ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id d22sm5831758eda.31.2018.03.30.07.19.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 30 Mar 2018 07:19:03 -0700 (PDT) From: Bryan O'Donoghue To: u-boot@lists.denx.de, fabio.estevam@nxp.com Date: Fri, 30 Mar 2018 15:18:43 +0100 Message-Id: <1522419526-29494-16-git-send-email-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1522419526-29494-1-git-send-email-bryan.odonoghue@linaro.org> References: <1522419526-29494-1-git-send-email-bryan.odonoghue@linaro.org> Cc: rui.silva@linaro.org, paul.liu@linaro.org Subject: [U-Boot] [PATCH 15/18] warp7: Make load command an environment variable X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This patch replaces the current "fatload" command with an environment variable. Making the load command into an environment variable means we can change filesystem type in boot.scr and reuse existing commands within that boot script. Signed-off-by: Bryan O'Donoghue --- include/configs/warp7.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/configs/warp7.h b/include/configs/warp7.h index c957b2d..712850e 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -51,12 +51,13 @@ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=PARTUUID=${uuid} rootwait rw\0" \ "warp7_auth_or_fail=hab_auth_img_or_fail ${hab_ivt_addr} ${filesize} 0;\0" \ + "loadcmd=fatload\0" \ "loadbootscript=" \ - "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ + "${loadcmd} mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ "bootscript=echo Running bootscript from mmc ...; " \ "source\0" \ - "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ - "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ + "loadimage=${loadcmd} mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ + "loadfdt=${loadcmd} mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ "mmcboot=echo Booting from mmc ...; " \ "run finduuid; " \ "run mmcargs; " \