Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4DD79EB64D7 for ; Wed, 28 Jun 2023 11:42:33 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D29D28663B; Wed, 28 Jun 2023 13:42:27 +0200 (CEST) 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="SqExpHDt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EC2BD8662C; Wed, 28 Jun 2023 13:42:18 +0200 (CEST) Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) (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 E664386624 for ; Wed, 28 Jun 2023 13:42:15 +0200 (CEST) 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-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-51d9123a8abso4677571a12.2 for ; Wed, 28 Jun 2023 04:42:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1687952535; x=1690544535; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DQcg17U8PyQRA3tYhxCYj3CDfA79qhdGyXeQQeKOKDE=; b=SqExpHDt+QDQWIyuyrHGo0pbv57E3EViYqbsN9vMmIm0zPjka6Ub02gFIYCX+WOxim T07nxedRAGkWNv+wi3lWBn09us+tSGvpbZPpor/mnLApbwCEf97ZvZiQHlI+bKW1Rcgy 6klS4StWuIqJ0Byccke+ZqPgkSsIDAgi8QTcc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687952535; x=1690544535; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DQcg17U8PyQRA3tYhxCYj3CDfA79qhdGyXeQQeKOKDE=; b=Ejvwt1MUg7qc8KFr+cnA6sxlcR71u4lqm8nbi3k9q5r/QC8ezriTCMVCTvu1RdWJh1 fIpHaK+JKsAZ+sFZ9j0jCcwe4P/4jrrnAk4DHv/i8pw4eilkG36/jjBKEeDV3FrHQ652 esE1e2KVF7uFdit3gDAIJuk0V2vgCsMqzkLcWHpNdFBp6+IsulKwm6wf1gUaGQd1dCtE sTplW486HHpGEqp3XFFLkYtq+3wZCJbqAGofbYG/h1RE4Wk+9JCWZjJFL4bohMxNN5nk +ybCOWdZZoj80WauzuflnwRKaXZJFjKpBB6xdohJ5V2zXEU5TP17pnDPTtkZtHUlZPnO Ef+A== X-Gm-Message-State: AC+VfDwMHOLuxBEJbF8gKJFt0S8PCVQV/jHLi5Al9sJcvqX+zs5U/FB8 9DYETW0vun6VH/uS6Nw11ZogfFAfLhRy4B0tw5C2jA== X-Google-Smtp-Source: ACHHUZ730O0TTlshF5b9paWUX54vXTlj3wMa2NNUgTYH//+zbvKFW2pMxqpjl1GG5hkLqYXG6iLJPg== X-Received: by 2002:aa7:c411:0:b0:51d:b75e:30ee with SMTP id j17-20020aa7c411000000b0051db75e30eemr1673332edq.40.1687952535224; Wed, 28 Jun 2023 04:42:15 -0700 (PDT) Received: from sjg1.praguecc.cz ([193.85.242.128]) by smtp.gmail.com with ESMTPSA id r18-20020aa7cb92000000b0051bec856cb4sm4676423edt.50.2023.06.28.04.42.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 04:42:14 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Jan Kiszka , Simon Glass , Alper Nebi Yasak , Jonas Karlman , Kever Yang , Marek Vasut , Neha Malcom Francis , Peng Fan , Philippe Reynes , Quentin Schulz , Stefan Herbrechtsmeier Subject: [PATCH 03/12] binman: Read _multiple_data_files in the correct place Date: Wed, 28 Jun 2023 12:41:36 +0100 Message-ID: <20230628114149.439723-4-sjg@chromium.org> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog In-Reply-To: <20230628114149.439723-1-sjg@chromium.org> References: <20230628114149.439723-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean Move this to the ReadEntries() function where it belongs. Signed-off-by: Simon Glass --- tools/binman/etype/mkimage.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/binman/etype/mkimage.py b/tools/binman/etype/mkimage.py index e028c4407081..cb3e10672ad7 100644 --- a/tools/binman/etype/mkimage.py +++ b/tools/binman/etype/mkimage.py @@ -121,7 +121,6 @@ class Entry_mkimage(Entry): """ def __init__(self, section, etype, node): super().__init__(section, etype, node) - self._multiple_data_files = fdt_util.GetBool(self._node, 'multiple-data-files') self._mkimage_entries = OrderedDict() self._imagename = None self._filename = fdt_util.GetString(self._node, 'filename') @@ -129,6 +128,8 @@ class Entry_mkimage(Entry): def ReadNode(self): super().ReadNode() + self._multiple_data_files = fdt_util.GetBool(self._node, + 'multiple-data-files') self._args = fdt_util.GetArgs(self._node, 'args') self._data_to_imagename = fdt_util.GetBool(self._node, 'data-to-imagename') -- 2.41.0.162.gfafddb0af9-goog