From patchwork Mon Oct 26 23:40:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1388216 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=85.214.62.61; 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=JSDzO5IZ; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CKs1g6sq5z9sTr for ; Tue, 27 Oct 2020 10:46:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C06C38253C; Tue, 27 Oct 2020 00:41:31 +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="JSDzO5IZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 031A9824D3; Tue, 27 Oct 2020 00:41:04 +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,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x144.google.com (mail-il1-x144.google.com [IPv6:2607:f8b0:4864:20::144]) (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 28B75824C4 for ; Tue, 27 Oct 2020 00:40:49 +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-x144.google.com with SMTP id k1so10934203ilc.10 for ; Mon, 26 Oct 2020 16:40:49 -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=MCQwJB/IF4PQ7vP1KtxVZEWVTgvJanm9oa/FQHrdb4U=; b=JSDzO5IZFLCPc07TG+p4VY05x3Oj43HURWgI9Njkhe2AUjV+xPhpX3geQookWadohm L4AUDLZJS0IR6r1b2REYIeZzAi7A3wERuqAHeLX+YQrcYn+4JvJxzBpZRSUqfGt6pWns +9wKJPZ/UBHieYrcabv9NEy9CdAd3Bd5KAJZE= 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=MCQwJB/IF4PQ7vP1KtxVZEWVTgvJanm9oa/FQHrdb4U=; b=U2hwNbVVzAS2nGkDVs95PENx8JfbzB+d804Qf4Ptrw5+fcgFumPCto0+j8FS1MXtjw OetkKGOtjHjcqAqAQQucsnPv9IMdRXybj96xFo/LxJkvDhFai5JJ3xu3W+AGHnDXCXRB msSc06pcz3Zsvu5pYuhmtaHmgsjLOQuM+cCqxP42SIeEowkLvXpCy+J4DQiTQlbadZNY rkUcmcSqbBIM/n2GX4EzScjT1bVXJLCNU6pcJZXvGWg/jXErC6S7Gb9I0Ht03Qixdfyi 9Ya/G9AwZoaXZ/j00bYih+8qaYq4oTsAKz5Q6q9Sz82Dg6BNPVkKY4Iv2Y3UfpL8LZJc l2tg== X-Gm-Message-State: AOAM531lOL2POmkndcldeJtAFARfEzy5tp/LfpVtBlmvyA9AaoI/Dtay kp942RJHd/OhP6Fll6rkcH6o8dPZ/kyXrRVk X-Google-Smtp-Source: ABdhPJwUIDtBqQDzyifFCLSJdzUB1l5K7Ii/mhzHbdnWmzJpIn0xl/yymfuT91nWu9+fywZf4/J2Jg== X-Received: by 2002:a92:7f09:: with SMTP id a9mr5964841ild.240.1603755647969; Mon, 26 Oct 2020 16:40:47 -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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 16:40:47 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Alper Nebi Yasak , Simon Glass Subject: [PATCH v2 21/28] binman: Move sort and expand to the main Pack() function Date: Mon, 26 Oct 2020 17:40:19 -0600 Message-Id: <20201026234026.1903778-21-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 At present sorting and expanding entries are side-effects of the CheckEntries() function. This is a bit confusing, as 'checking' would not normally involve making changes. Move these steps into the Pack() function instead. Signed-off-by: Simon Glass Signed-off-by: Simon Glass --- (no changes since v1) tools/binman/etype/section.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py index fb4bf640bfb..c883f0d67c4 100644 --- a/tools/binman/etype/section.py +++ b/tools/binman/etype/section.py @@ -260,6 +260,10 @@ class Entry_section(Entry): def Pack(self, offset): """Pack all entries into the section""" self._PackEntries() + if self._sort: + self._SortEntries() + self._ExpandEntries() + return super().Pack(offset) def _PackEntries(self): @@ -290,9 +294,6 @@ class Entry_section(Entry): def CheckEntries(self): """Check that entries do not overlap or extend outside the section""" - if self._sort: - self._SortEntries() - self._ExpandEntries() offset = 0 prev_name = 'None' for entry in self._entries.values():