From patchwork Sat Jul 20 18:23:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1134461 X-Patchwork-Delegate: sjg@chromium.org 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=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Q9e79qYt"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45rcGQ4RJhz9s4Y for ; Sun, 21 Jul 2019 04:43:58 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 57003C21E08; Sat, 20 Jul 2019 18:29:53 +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=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 324D9C21E6C; Sat, 20 Jul 2019 18:25:37 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EBD4DC21E1D; Sat, 20 Jul 2019 18:25:09 +0000 (UTC) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by lists.denx.de (Postfix) with ESMTPS id AB68EC21D65 for ; Sat, 20 Jul 2019 18:25:07 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id h6so65218863iom.7 for ; Sat, 20 Jul 2019 11:25:07 -0700 (PDT) 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=nZdWNAe7Ggc5lUfUb8qpQt95BiZ2oGTlRYsTND7fmD8=; b=Q9e79qYtZ26DFa1t39kx1xe3eok3yRnSzu/CfiasphOfIsPNsBW+UTFOs3mFE+x9R4 Jd9V3KVV3QCEzImSHTcA69uhM3dEY45p5MpsKGUWe71xx0pvOLZR51qazRMTCFGMDMcT 8HMKeFNc5SSZeouh9Ri1bxhdLrTjTeWvj+uDY= 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=nZdWNAe7Ggc5lUfUb8qpQt95BiZ2oGTlRYsTND7fmD8=; b=fsnnYFRkLhgRRwsLmZ1xhq8mTh1OVkTSNxGWecw1zW9X0xVcO044ITRAk7276ivlH8 rRW4MegXOOZUrSMeg+SwfvYEWuRc93I+Gj5eoqJ1ZsqaM1rWATqoD9ft1qKIRLPM/VuE K2IqR2tZvT7qCune3jJZcPSgc4p1Qxfz9h9WPRFiqF+79DHokpllYb4/PX6SEozGY7hJ PX7YXsGBoFAF9WgvfTe9pAqTJhiFOnQLsPb4oPIyJtWV/B82wDP0sst5TsXBlE8vXdZe 5yrpqAqUEF/oygJAonSLHqKqnnqllckllJvjhTu5Jxs1M+aGablm8scyiBzuedStwzo1 jZrA== X-Gm-Message-State: APjAAAXyrhTO9sMoPE+H7BqvfJt24QmMYVVziFINznYKga6DKwsQ7MDW 0BIRN2+dAbEcr5nc84lJriNDXNEI7fA= X-Google-Smtp-Source: APXvYqyJbEvAPDwysS5rIpxvUi+h/rjqglX23BCe2F3Oumc4+nxldmpeaAOXfWCK5qgUdN+AvO66jA== X-Received: by 2002:a6b:4107:: with SMTP id n7mr13453930ioa.12.1563647106592; Sat, 20 Jul 2019 11:25:06 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id z17sm49778933iol.73.2019.07.20.11.25.06 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 20 Jul 2019 11:25:06 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sat, 20 Jul 2019 12:23:34 -0600 Message-Id: <20190720182416.183626-13-sjg@chromium.org> X-Mailer: git-send-email 2.22.0.657.g960e92d24f-goog In-Reply-To: <20190720182416.183626-1-sjg@chromium.org> References: <20190720182416.183626-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 12/53] binman: Drop state.fdt_set as this is not needed 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" We can iterate through the output files so don't need this global anymore. Remove it. Signed-off-by: Simon Glass Signed-off-by: Simon Glass --- tools/binman/state.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/tools/binman/state.py b/tools/binman/state.py index 46c1c8d613a..7c3a987723e 100644 --- a/tools/binman/state.py +++ b/tools/binman/state.py @@ -28,13 +28,6 @@ entry_args = {} # ftest.py) use_fake_dtb = False -# Dict of device trees, keyed by entry type. These are the input device trees, -# before any modification by U-Boot -# The value is as returned by Entry.GetFdts(), i.e. a tuple: -# Fdt object for this dtb, or None if not available -# Filename of file containing this dtb -fdt_set = {} - # The DTB which contains the full image information main_dtb = None @@ -136,7 +129,7 @@ def Prepare(images, dtb): images: List of images being used dtb: Main dtb """ - global fdt_set, output_fdt_files, main_dtb + global output_fdt_files, main_dtb # Import these here in case libfdt.py is not available, in which case # the above help option still works. import fdt @@ -151,8 +144,8 @@ def Prepare(images, dtb): output_fdt_files['u-boot-dtb'] = [dtb, 'u-boot.dtb'] output_fdt_files['u-boot-spl-dtb'] = [dtb, 'spl/u-boot-spl.dtb'] output_fdt_files['u-boot-tpl-dtb'] = [dtb, 'tpl/u-boot-tpl.dtb'] - fdt_set = {} if not use_fake_dtb: + fdt_set = {} for image in images.values(): fdt_set.update(image.GetFdts()) for etype, other in fdt_set.items(): @@ -172,7 +165,7 @@ def GetAllFdts(): Device trees being used (U-Boot proper, SPL, TPL) """ yield main_dtb - for etype in fdt_set: + for etype in output_fdt_files: dtb = output_fdt_files[etype][0] if dtb != main_dtb: yield dtb