From patchwork Sat Sep 12 21:35:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 1362922 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=85.214.62.61; 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=m4RADmxF; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm3 header.b=lO7qUK4d; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4BpmC717LMz9sSP for ; Sun, 13 Sep 2020 07:36:00 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CF76E821DB; Sat, 12 Sep 2020 23:35:53 +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="m4RADmxF"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="lO7qUK4d"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D92C0822ED; Sat, 12 Sep 2020 23:35:52 +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 CF5C880390 for ; Sat, 12 Sep 2020 23:35:49 +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 731235C00D6; Sat, 12 Sep 2020 17:35:47 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sat, 12 Sep 2020 17:35:47 -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=wpC1C6T7eA0UV CwZi0CfU+Z1axM2pTzoqQNkFeNjpC4=; b=m4RADmxFhsuG0mOEvu6RnCTP5MI0d UF2Y9fU8weewpLuzph5O1obX7zF+30AwOquXhhAT3X6q0j/ZNYogpdnKhDHdJ1F9 RwVixe+RGdypiXNZip4B/f1uhaJtcfeXHeFuq1jFvnv8yXBwVp6aixTMQrLjrbiK kVjM/nR3KjrMGhWhFXXcJjEuMs/M9QpR/l4shQowe6JB9knsCqonSLK8qHwiAHS1 yd75/I01boOwKPNFpQbl8Q7Lkf2DnpiYBKl911mIm5KHzeLHlaEcwMyP2pKqL94q XfM15MNhkjPxqt6GRik1COTp4hkQspcu/QaHv8DaSq27IkeDh0T1DjSBw== 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=wpC1C6T7eA0UVCwZi0CfU+Z1axM2pTzoqQNkFeNjpC4=; b=lO7qUK4d 2cD8c8ZnHRb1wNMgbIldOm2emXzmrTQsh5zptptoodjjkKyOlkGsSDF+AUmCtREb 00qXpcfA/4JXIiV80dDkUQjzyXUzFpivG3HZOn+kbpy+qhpv+MrR4aULUmGanDBC tWoCXMifzzq5BMoA9g3UjG0UPeIptvBwjsS291z/DNB8EDYqvtRoyPvOdbcMuTYp rhrf/kpf5Q1urrKJa1KNPyoDuvLIHAc5AiyGLmnfjZYQHUZYF3rCSPXCEnZzMj+4 LrNz09hZjVh+EbT5SDjL4AR2lG7Vx2XXnxOrRgqwM2z1BsAbVIEEY73u4BE8FzS7 PWoygIXmNJ69Rg== 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 6C1EC3280059; Sat, 12 Sep 2020 17:35:46 -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 2/9] binman: Only write FDT once per node Date: Sat, 12 Sep 2020 16:35:38 -0500 Message-Id: <20200912213545.64376-3-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 Due to an extra level of indentation, the "data" property containing the FDT was being written repeatedly after every other property in the node. Move the block up one level, so the property is added exactly once. Reviewed-by: Simon Glass Signed-off-by: Samuel Holland --- tools/binman/etype/fit.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/binman/etype/fit.py b/tools/binman/etype/fit.py index c291eb26bad..01fa51367e6 100644 --- a/tools/binman/etype/fit.py +++ b/tools/binman/etype/fit.py @@ -179,10 +179,10 @@ class Entry_fit(Entry): b'SEQ', tools.ToBytes(str(seq + 1))) fsw.property(pname, val) - # Add data for 'fdt' nodes (but not 'config') - if depth == 1 and in_images: - fsw.property('data', - tools.ReadFile(fname)) + # Add data for 'fdt' nodes (but not 'config') + if depth == 1 and in_images: + fsw.property('data', + tools.ReadFile(fname)) else: if self._fdts is None: if self._fit_list_prop: