| Message ID | 20201022021216.36839-5-samuel@sholland.org |
|---|---|
| State | Accepted |
| Commit | 6b7c7ed80a5a02325adcaef1eaaeb2d9ffedc314 |
| Delegated to: | Jagannadha Sutradharudu Teki |
| Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sholland.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.a=rsa-sha256 header.s=fm1 header.b=i4svqheQ; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm1 header.b=gxjETDC6; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CGrVh2Spzz9sSn for <incoming@patchwork.ozlabs.org>; Thu, 22 Oct 2020 13:13:00 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AC17B82435; Thu, 22 Oct 2020 04:12:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=sholland.org header.i=@sholland.org header.b="i4svqheQ"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="gxjETDC6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 67D1D82443; Thu, 22 Oct 2020 04:12:26 +0200 (CEST) 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,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9C39A82423 for <u-boot@lists.denx.de>; Thu, 22 Oct 2020 04:12:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sholland.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=samuel@sholland.org Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id C6CFA5C022D; Wed, 21 Oct 2020 22:12:19 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 21 Oct 2020 22:12:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm1; bh=gOYiuXpfAwzsm d94JiYGL72DZVSyLwjmC2CX4+9Xurs=; b=i4svqheQ+KttFuZO6KZSRnqtnoUqY ysvGtjokqiuAKq3lWx7Ljpnw8bsYzlGGUvbYT/tXPBF/+ZWLNQLEaGrKfRDJJkbf r2se/R/L5CqsNQBxw96Y4p9C8giXRmwn1eEpvXMKpDfrYbvGweJqIo3AZZHIj6xL Bz6vV5+N0ihYuFyin0FPZ0p3CFZYAlENFa86lj3bDcaA+6HzWKFimgR1H6wpXQ0g 777iLrxvAA896GrWuDJ7vhZ8E21Eak0Q43TjmpfTw56gZhon8jZduvjPqu1o6YEd As5UpVVjZuty9jcrQCNo8scrEtNm3LNK2ZruhrQKTMw1rofP0dWdrvJCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=gOYiuXpfAwzsmd94JiYGL72DZVSyLwjmC2CX4+9Xurs=; b=gxjETDC6 Nby+PqI3Ve5JLQHPfg3WxaSyrc5OhWa9JZHb2h+vfxnB/Z+Ais2e/TTD9NfJr4gB NQSS8l72X6pzX+7hfSW01gLDzsy3XRtMfHQqvrMHIhDW7iZAsKK3S4x0S5ck1joP PynnZRzSRLc3UOqUVPojhVpILTxzKiEaXP/VqSdSqyCWE5OIXQZfbu7A6kKgbSAQ QgYpPB/eiczvpkoAg/RX1zgbZquX+0EqOAd+afc+22lH188ZdWxWJ8aTSjMt4Esa HGQdBNZu61RR5jMOnqmvQGCQISq5UfpvidupxGwPgAAzBJDrHEK/SorxvThd5hKm L1HMJJyW/mtAJQ== X-ME-Sender: <xms:g-qQX343kCj_1upiNY8Xkg-ckhWyv1hVa8AF3X6U8npCYuhsdw31XQ> <xme:g-qQX87wYIsjeofZ6inDFgPuFDF1o0ORJrNYyl03NRtzzJIQSuQJtkL_Ncm1B_Wpk pVCDBarT0WCC2XLtA> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrjeeigdehgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhuvghl ucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecuggftrf grthhtvghrnhepudfhjeefvdfhgfefheetgffhieeigfefhefgvddvveefgeejheejvdfg jeehueeinecukfhppeejtddrudefhedrudegkedrudehudenucevlhhushhtvghrufhiii gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsrghmuhgvlhesshhhohhllhgrnhgu rdhorhhg X-ME-Proxy: <xmx:g-qQX-fz5wnIdWDMHGs34IiKkYu09X-CrFJunPv9wkt0F69Maze23A> <xmx:g-qQX4LPuwzkFeS-UQJzJvRIY5fATobiHn4xZUFP3RVpD8GtKtLEsA> <xmx:g-qQX7LqgWxHsq2FSTRy4WNdyCcFVAn5kJNH-hIiulsaxgy1htBjAg> <xmx:g-qQX4pKQHUP9Wxa6-wcK-ylyRhCaWLHW1jto8jIOy4Gs6EoopOU6Q> Received: from titanium.stl.sholland.net (70-135-148-151.lightspeed.stlsmo.sbcglobal.net [70.135.148.151]) by mail.messagingengine.com (Postfix) with ESMTPA id 213423280059; Wed, 21 Oct 2020 22:12:19 -0400 (EDT) From: Samuel Holland <samuel@sholland.org> To: Jagan Teki <jagan@amarulasolutions.com>, Simon Glass <sjg@chromium.org>, Maxime Ripard <mripard@kernel.org>, Hans de Goede <hdegoede@redhat.com>, Bin Meng <bmeng.cn@gmail.com>, Kever Yang <kever.yang@rock-chips.com>, Heinrich Schuchardt <xypron.glpk@gmx.de>, Andre Przywara <andre.przywara@arm.com> Cc: u-boot@lists.denx.de, Samuel Holland <samuel@sholland.org> Subject: [PATCH v5 4/9] sunxi: binman: Provide a default BL31 filename Date: Wed, 21 Oct 2020 21:12:11 -0500 Message-Id: <20201022021216.36839-5-samuel@sholland.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201022021216.36839-1-samuel@sholland.org> References: <20201022021216.36839-1-samuel@sholland.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean |
| Series |
sunxi: binman fixes and SCP firmware support
|
expand
|
diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi index 92a64472318..b7195c56710 100644 --- a/arch/arm/dts/sunxi-u-boot.dtsi +++ b/arch/arm/dts/sunxi-u-boot.dtsi @@ -52,6 +52,7 @@ #endif atf-bl31 { + filename = "bl31.bin"; missing-msg = "atf-bl31-sunxi"; }; };
Prior to commit 7f7f8aca8257 ("sunxi: Convert 64-bit boards to use binman"), if the BL31 environment variable was not defined, the firmware would be loaded from a file "bl31.bin" in the current directory. Restore that behavior by providing that as the default filename in case no entry arg is provided, which will be the case if the environment variable is unset. Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Samuel Holland <samuel@sholland.org> --- arch/arm/dts/sunxi-u-boot.dtsi | 1 + 1 file changed, 1 insertion(+)