From patchwork Mon Oct 26 23:40:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1388202 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=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=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=PslOu7Dr; 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 4CKrwf49yZz9sT6 for ; Tue, 27 Oct 2020 10:42:26 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 27766824EA; Tue, 27 Oct 2020 00:40:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="PslOu7Dr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BCC778246A; Tue, 27 Oct 2020 00:40:45 +0100 (CET) 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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,T_SPF_HELO_TEMPERROR, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DF0328246A for ; Tue, 27 Oct 2020 00:40:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x132.google.com with SMTP id q1so10923278ilt.6 for ; Mon, 26 Oct 2020 16:40:35 -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=s+qqu7N6oPbBlMrqhCjrvziI75mvUzo7co3YWG6xHOU=; b=PslOu7Dr28IdKmYI3/C33D7adzH0YM/khs+j0g3+hOopT+zQBycAzKXzTmmklL8ThB Cc7lrx72JExL+UGGj02tLlNNoyZ8+EJ/x7hDtMqLjccQsxnQGeBpnI2KYOGOdWokW/uU r2NHE8Vxn+2emKUg6qyePREGVP72IfKUAxZrY= 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=s+qqu7N6oPbBlMrqhCjrvziI75mvUzo7co3YWG6xHOU=; b=YeIXuJoLBbCdjLLAL8CewTVLDWcyk3JFWlauEwEy+2e68a9ROeujH/b4v/F2Qw5qXU Czb4RY7joljqQfnHm6bMjN0O9f91jU4Vlo/kHIwn3hbpKuzCWnRbhhP0B0b9Z0tpQkZc +Z/u8GBQM8Ceits1hUC+p3dSaNsgRvN/QzsjLp7QcKUwrwWfKJvmHLdQng9W5XeEBaRt 7KlNYF44sy+VilTj/cXNd+nulCbXtxMsCGo/bzwghunD1DGNsHM7sgcH9XBiNsZlzWeD WvgWbCAaZmkfFVwh1FCaZVvF5YmBu9245BfzOk/ZGn4SdXwx9/hs7tPd/ZAZj/GUFFIN Sq5A== X-Gm-Message-State: AOAM532/hYrsCCWzeU8bi2NQ8+k6PVvy4MfQiZxfayNYnITgPdnodcZj 9MdF5gDdGtVLhOT8Z7wwKeTDh9V7nsYA9hXl X-Google-Smtp-Source: ABdhPJwMBtUMMwySN0QCbMCBI3yUkPGE8S1BjwbGhTdY40aXnyT8axUz/jMgHZ1sMJDl/KFI9QtSHg== X-Received: by 2002:a92:d11:: with SMTP id 17mr12880028iln.4.1603755634746; Mon, 26 Oct 2020 16:40:34 -0700 (PDT) Received: from localhost.localdomain (c-73-14-175-90.hsd1.co.comcast.net. [73.14.175.90]) by smtp.gmail.com with ESMTPSA id e17sm7066857ile.60.2020.10.26.16.40.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 16:40:34 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Alper Nebi Yasak , Simon Glass Subject: [PATCH v2 06/28] binman: Remove references to 'image' in entry_Section Date: Mon, 26 Oct 2020 17:40:04 -0600 Message-Id: <20201026234026.1903778-7-sjg@chromium.org> X-Mailer: git-send-email 2.29.0.rc2.309.g374f81d7ae-goog In-Reply-To: <20201026234026.1903778-1-sjg@chromium.org> References: <20201026234026.1903778-1-sjg@chromium.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 While a section is the base class of Image, it is more correct to refer to sections in most places in this file. Fix these comments. Signed-off-by: Simon Glass Signed-off-by: Simon Glass --- (no changes since v1) tools/binman/etype/section.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py index 515c97f9290..327750461eb 100644 --- a/tools/binman/etype/section.py +++ b/tools/binman/etype/section.py @@ -56,7 +56,7 @@ class Entry_section(Entry): self._end_4gb = False def ReadNode(self): - """Read properties from the image node""" + """Read properties from the section node""" super().ReadNode() self._pad_byte = fdt_util.GetInt(self._node, 'pad-byte', 0) self._sort = fdt_util.GetBool(self._node, 'sort-by-offset') @@ -183,7 +183,7 @@ class Entry_section(Entry): return super().Pack(offset) def _PackEntries(self): - """Pack all entries into the image""" + """Pack all entries into the section""" offset = self._skip_at_start for entry in self._entries.values(): offset = entry.Pack(offset) @@ -209,7 +209,7 @@ class Entry_section(Entry): self._entries[entry._node.name] = entry def CheckEntries(self): - """Check that entries do not overlap or extend outside the image""" + """Check that entries do not overlap or extend outside the section""" if self._sort: self._SortEntries() self._ExpandEntries() @@ -456,7 +456,7 @@ class Entry_section(Entry): def CheckSize(self): - """Check that the image contents does not exceed its size, etc.""" + """Check that the section contents does not exceed its size, etc.""" contents_size = 0 for entry in self._entries.values(): contents_size = max(contents_size, entry.offset + entry.size)