From patchwork Mon Nov 9 14:12:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1396794 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=no1CYFcA; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CVCdG45qNz9sRK for ; Tue, 10 Nov 2020 01:13:06 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6BD6282518; Mon, 9 Nov 2020 15:12:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="no1CYFcA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2F9EA822D2; Mon, 9 Nov 2020 15:12:42 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,LOTS_OF_MONEY,SPF_HELO_NONE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x143.google.com (mail-il1-x143.google.com [IPv6:2607:f8b0:4864:20::143]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BD019822D2 for ; Mon, 9 Nov 2020 15:12:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x143.google.com with SMTP id x20so8386350ilj.8 for ; Mon, 09 Nov 2020 06:12:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z0cO3E9OHthx6UgRsBOpP7QNfVHj0OavODJHVLX3xCE=; b=no1CYFcAedptuqqXyXsf7vTRxwMj0klonm0grb4UhL4N7JmbbpTfKZ8PbCpazcFaLo fIN/Zx2jUw9HZ8ZyOtpB4b2JwcdZPW1cLTn/Mq8orw5/WNryZkmayy2ZdfbT34NNtor5 kkttRwKcuhZLdvmSSbHneIpfS4nE28OcMzSgs= 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:mime-version:content-transfer-encoding; bh=Z0cO3E9OHthx6UgRsBOpP7QNfVHj0OavODJHVLX3xCE=; b=jvyY95JKog4Q1Kx9dtavvDx5tmxss5oScj8U1852ogdotFHyF570bhBqdN4BF6Km2V Ks9rXEM2c40AADe3zJllzdPE/X+oWK2z7Vz2fRI1h2YNOG0JDczl01dbvFo3YoYSF5uo w8I86y7qX8sGRNpkD9wbFWCZowTmIpTqWyjoW4zbsbMvq3px+XDggSPdlPm2j9XwfAsi fCQvknoddHo5w1acWl1qN90P0NgrOfONlXT6cw/xjP7czTXRW4nSy2H3+ogkMJdDqzn1 zPsnBaJpFt8KO7Rw5maZlcQkqh+V58y3FH2L4YnDcyfE7kIJoPG1+MNEzr9fykqkeRHB 9bVw== X-Gm-Message-State: AOAM530N6RkGN0Kraalu4KATlprwj9hxah4h6k+sDJUwGcNfWqQEWMRW n3BCucxLprw5VUtgYKV2+3/b98tjl6wbRA== X-Google-Smtp-Source: ABdhPJzc1BY9s0/nSXqrT8rg9TVwYqIllNpIQELxvWARxnBH4Hgce0B8ky9IV+SE8AuqAWT4gy9RBQ== X-Received: by 2002:a05:6e02:96b:: with SMTP id q11mr1690307ilt.117.1604931156414; Mon, 09 Nov 2020 06:12:36 -0800 (PST) Received: from localhost.localdomain (c-73-14-175-90.hsd1.co.comcast.net. [73.14.175.90]) by smtp.gmail.com with ESMTPSA id y2sm5869944ioc.46.2020.11.09.06.12.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 06:12:35 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Bin Meng , Simon Glass Subject: [PATCH 3/3] x86: coral: Update the boot script Date: Mon, 9 Nov 2020 07:12:25 -0700 Message-Id: <20201109071220.3.I474343b4fba2d055f266958b219e3e3e941c790b@changeid> X-Mailer: git-send-email 2.29.2.222.g5d2a92d10f8-goog In-Reply-To: <20201109071220.1.I7953ac0c0e042eb6e108f600ab08d1cb04258604@changeid> References: <20201109071220.1.I7953ac0c0e042eb6e108f600ab08d1cb04258604@changeid> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Make use of the new bootargs substitution mechanism and zboot command syntax. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- include/configs/chromebook_coral.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/include/configs/chromebook_coral.h b/include/configs/chromebook_coral.h index d4d32758e99..6e8e8ec1709 100644 --- a/include/configs/chromebook_coral.h +++ b/include/configs/chromebook_coral.h @@ -15,10 +15,13 @@ "read mmc 2:2 100000 0 80; setexpr loader *001004f0; " \ "setexpr size *00100518; setexpr blocks $size / 200; " \ "read mmc 2:2 100000 80 $blocks; setexpr setup $loader - 1000; " \ - "setexpr cmdline $loader - 2000; " \ - "part uuid mmc 2:2 uuid; setenv bootargs_U $uuid; " \ - "zboot start 100000 0 0 0 $setup $cmdline; " \ - "zboot load; zboot setup; zboot dump; zboot go" + "setexpr cmdline_ptr $loader - 2000; " \ + "setexpr.s cmdline *$cmdline_ptr; " \ + "setexpr cmdline gsub %U \\\\${uuid}; " \ + "if part uuid mmc 2:2 uuid; then " \ + "zboot start 100000 0 0 0 $setup cmdline; " \ + "zboot load; zboot setup; zboot dump; zboot go;" \ + "fi" #include #include