From patchwork Sat Jul 20 18:23:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1134436 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="gY+EuqkZ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45rc5W5JKxz9s3l for ; Sun, 21 Jul 2019 04:36:15 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 6B0C3C21DD3; Sat, 20 Jul 2019 18:27:24 +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 A3644C21C38; Sat, 20 Jul 2019 18:25:29 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EA358C21C93; Sat, 20 Jul 2019 18:25:09 +0000 (UTC) Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by lists.denx.de (Postfix) with ESMTPS id 9B4DAC21DD4 for ; Sat, 20 Jul 2019 18:25:04 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id q22so65243490iog.4 for ; Sat, 20 Jul 2019 11:25:04 -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=mXbVLd++BL4RHHQnhe29HJoElb04e2F8AhcV7EX1fFY=; b=gY+EuqkZNqfZugSfaI0iqnL2tuYcbuUfBCIiTviRFjHJNajuHAS1PMFByDjKWftagt cYW0oPD2aSHErHV8NtoweD1lYys93hDqnp0dlqTh484HWmob17UYS7uryK9049px9qF5 ancY+/bcS8upi0OsVXZEZZ2LJgcSOgT7paSPc= 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=mXbVLd++BL4RHHQnhe29HJoElb04e2F8AhcV7EX1fFY=; b=hnYyQ7EYjule2FdZhPqSEXdSv2S/C5l3Ctr3IHGB+4YDb/iZ53eI646QeqHJ6vl9Ui ZvNi9U08ieLqRACuXzN74+3Bwrvm8xptb81KWSN6ShsiLj2QsuznFHlzUa8wCpCDFwzR vmwxxObZf6N89NSeczobjOoxyq+oOMdzwbIWiJTSh8pU4fTClFYMjhp9RYPAbdCRJroq 6h0DO/U0aSQsvdTcemxUWTiX6l069uNVSkKgDZ/iT4N6DVayVqnYTQkg8+atuWkDuBI4 wbJX+zXBakfJgJg75wzF6Q2/OZ5rTQbfUk4XCVtZuB9grN0m1YJgXFK0aLv5QWCffrGI y7qw== X-Gm-Message-State: APjAAAXiOCHdEmtK2XnWcW0S0jpKkPStqT3Fv3Ko3YPE+ntMo7Gxo9zV yzqh2d8et7u23clfDCQ/raGIb3uXHfY= X-Google-Smtp-Source: APXvYqwGdVsgrtLvSrbBetQQECYaE039v96wfIdPZfPifRMvumjBjD2HTjMVQZWBxdfTqzU+ebTBXw== X-Received: by 2002:a02:c95a:: with SMTP id u26mr60098231jao.15.1563647103541; Sat, 20 Jul 2019 11:25:03 -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.03 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 20 Jul 2019 11:25:03 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sat, 20 Jul 2019 12:23:29 -0600 Message-Id: <20190720182416.183626-8-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 07/53] binman: Rename state.GetFdts() 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" This function name conflicts with Entry.GetFdts() which has a different purpose. Rename it to avoid confusion. Also update a stale comment relating to this function. Signed-off-by: Simon Glass Signed-off-by: Simon Glass --- tools/binman/control.py | 6 +++--- tools/binman/state.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/binman/control.py b/tools/binman/control.py index de9f29e2246..8700f48ad55 100644 --- a/tools/binman/control.py +++ b/tools/binman/control.py @@ -231,7 +231,7 @@ def PrepareImagesAndDtbs(dtb_fname, select_images, update_fdt): image.AddMissingProperties() image.ProcessFdt(dtb) - for dtb_item in state.GetFdts(): + for dtb_item in state.GetAllFdts(): dtb_item.Sync(auto_resize=True) dtb_item.Pack() dtb_item.Flush() @@ -278,7 +278,7 @@ def ProcessImage(image, update_fdt, write_map): image.SetImagePos() if update_fdt: image.SetCalculatedProperties() - for dtb_item in state.GetFdts(): + for dtb_item in state.GetAllFdts(): dtb_item.Sync() sizes_ok = image.ProcessEntryContents() if sizes_ok: @@ -355,7 +355,7 @@ def Binman(args): ProcessImage(image, args.update_fdt, args.map) # Write the updated FDTs to our output files - for dtb_item in state.GetFdts(): + for dtb_item in state.GetAllFdts(): tools.WriteFile(dtb_item._fname, dtb_item.GetContents()) finally: diff --git a/tools/binman/state.py b/tools/binman/state.py index 5b9e005df96..77c7024f5a7 100644 --- a/tools/binman/state.py +++ b/tools/binman/state.py @@ -117,8 +117,8 @@ def GetEntryArg(name): def Prepare(images, dtb): """Get device tree files ready for use - This sets up a set of device tree files that can be retrieved by GetFdts(). - At present there is only one, that for U-Boot proper. + This sets up a set of device tree files that can be retrieved by + GetAllFdts(). This includes U-Boot proper and any SPL device trees. Args: images: List of images being used @@ -152,7 +152,7 @@ def Prepare(images, dtb): other_dtb = fdt.FdtScan(out_fname) fdt_files[other_fname] = other_dtb -def GetFdts(): +def GetAllFdts(): """Yield all device tree files being used by binman Yields: