From patchwork Sat Sep 12 21:35:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1362925 X-Patchwork-Delegate: jagannadh.teki@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=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=fm3 header.b=ugKg7ehR; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=Eot0eD5n; 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 4BpmCp1vQnz9sSP for ; Sun, 13 Sep 2020 07:36:38 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A958882319; Sat, 12 Sep 2020 23:35:58 +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="ugKg7ehR"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="Eot0eD5n"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 47D10822FC; Sat, 12 Sep 2020 23:35:55 +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 out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D577B822B5 for ; Sat, 12 Sep 2020 23:35:50 +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 compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id B84A75C00EB; Sat, 12 Sep 2020 17:35:48 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sat, 12 Sep 2020 17:35:48 -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=fm3; bh=C9SoJySpfLqCm 2uQPsgdZWBcGsFqeyZb0S44Jz9R/xE=; b=ugKg7ehRvvelidJu/9u9SyP9BxJMM FECCcrqGBr2BstPnqYliSlu60YKwYhKE8yZ8+OB8yrnClvxL5elzsY56UdduVOo4 mctvLITxyM1BiWAS7qahTlbuFEXiSYDirvt2wiXxzTlYJ7lIfVmPzh6t++u9xrR8 jLMjyHo3MAWilV/8PutfVFOU7bLNygrY/fgPiAY60O3dgRZciQPHJWWLHH4JFF7k VZYZUPk5yPgUvfPPnaeysN10NZJHREihXi/0pg0WWtHkYR38qooM9/ywRR8pl1/s FkpkW3Wtf0eZAmSn/BS6lhyFNhul7I6tNcLhAWjITwMP5R2QXVI0awRsA== 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= fm3; bh=C9SoJySpfLqCm2uQPsgdZWBcGsFqeyZb0S44Jz9R/xE=; b=Eot0eD5n HjLAsJPlOLdMW86l6hXM5bMuWldl6QM0mfjkoYz95bxmH7/ubeERjxW4yan4+2Dx smIcR7cdIszkNhO1XnrbaOjOsbTipgFB8OBXC/iWwQWAtTCRYRU604pG9LLE5r13 eV3qfjtbWtu1rVWQtpqitrXmeV6TFb/TbwCdjc/z7fgGfNjIcPOOC0yXTBgeFsWf h8aLXkNRGEBwMx1dqsnLXyr8X4sDf8tGaoa3dJkYbKdpsUrTVlKoWxYLiogr86LC /xNsFvR9OE+KWuecTbfb/ZTvDBJFtDpIaetuB8UlxInAvQ8jGz4GdvCGtEEROalP sqnsiob8TWYgMA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudeiuddgudeigecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudfhjeefvdfhgfefheetgffhieeigfefhefgvddvveefgeejheej vdfgjeehueeinecukfhppeejtddrudefhedrudegkedrudehudenucevlhhushhtvghruf hiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsrghmuhgvlhesshhhohhllhgr nhgurdhorhhg X-ME-Proxy: 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 2D914328005D; Sat, 12 Sep 2020 17:35:48 -0400 (EDT) From: Samuel Holland To: Simon Glass , Jagan Teki , Maxime Ripard , Hans de Goede , Bin Meng , Kever Yang , Heinrich Schuchardt , Andre Przywara Cc: u-boot@lists.denx.de, Samuel Holland Subject: [PATCH v4 6/9] sunxi: binman: Use a macro for the BL31 load address Date: Sat, 12 Sep 2020 16:35:42 -0500 Message-Id: <20200912213545.64376-7-samuel@sholland.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200912213545.64376-1-samuel@sholland.org> References: <20200912213545.64376-1-samuel@sholland.org> 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 This consolidates the SoC-specific part at the top of the file to avoid cluttering it up with preprocessor conditions. Reviewed-by: Simon Glass Signed-off-by: Samuel Holland --- arch/arm/dts/sunxi-u-boot.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi index 6ab0c783ba5..4d599720382 100644 --- a/arch/arm/dts/sunxi-u-boot.dtsi +++ b/arch/arm/dts/sunxi-u-boot.dtsi @@ -1,5 +1,11 @@ #include +#ifdef CONFIG_MACH_SUN50I_H6 +#define BL31_ADDR 0x104000 +#else +#define BL31_ADDR 0x44000 +#endif + / { aliases { mmc1 = &mmc2; @@ -42,14 +48,8 @@ type = "firmware"; arch = "arm64"; compression = "none"; -/* TODO: Do this with an overwrite in this board's dtb? */ -#ifdef CONFIG_MACH_SUN50I_H6 - load = <0x104000>; - entry = <0x104000>; -#else - load = <0x44000>; - entry = <0x44000>; -#endif + load = ; + entry = ; atf-bl31 { filename = "bl31.bin";