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 3E360C433EF for ; Thu, 3 Mar 2022 21:19:03 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 38CC683D81; Thu, 3 Mar 2022 22:17:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nu8q6JhB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ADCF483CD6; Thu, 3 Mar 2022 22:17:19 +0100 (CET) Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) (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 0B5B683D80 for ; Thu, 3 Mar 2022 22:17:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=alpernebiyasak@gmail.com Received: by mail-ed1-x529.google.com with SMTP id y2so3631816edc.2 for ; Thu, 03 Mar 2022 13:17:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:from:subject:to:cc :references:content-language:in-reply-to:content-transfer-encoding; bh=daScKEsoCUl24uWGzqUQm9H3tjIleRPn2tIV3Y6Hmr4=; b=nu8q6JhBMn+WXYkfYAv+5aflbkHdMxQynckqqUtvGvjVc0GgyhRVw0oXxIATvNdPV5 Yrb4mN0p5m+5NEGDowhwSu4pkGWEGkqomK4xF98lS5ASTGTFZXDzlYPcSZC5sh/Nkhct IHT0OoEsZME4srI7T9GbVAlGUO1jslXF0TtTYukvLgFWIXSOfuYxLFa+CNEsFtqdPBPx KAXfl9He/4ml97fPc8zcg7NKhaqI7r9ClgnHn7aQt7SPhw9MCp1v/3HpmG/FV92wyOyZ cfY7D/pVZb1KIOj32onFCziOJWgK4+RGBq8i33VZw8wbxXvY3toyRiz9KaNENHf96EW7 ZMSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:from :subject:to:cc:references:content-language:in-reply-to :content-transfer-encoding; bh=daScKEsoCUl24uWGzqUQm9H3tjIleRPn2tIV3Y6Hmr4=; b=7crZqTM2FAzkaRkIOzk1b7iH+cOC1cBQZbtYYvr9A893RhlL+3zAqNdQ73fF74NlZJ juFZsvljclcd5bXguHQHXVoZlPZUy9up+I/tCbJLtHpb+cVYLKq+paCzel5oOgo/5Ufj V/kMktrnjZfle63lVK6dND5OcxPOBqddVcoAPlxP3SmXf8YPEF4zAr4T1+G0yzGz/HTI sNO9BfhMAnVKh7DWDDT2bGiU+uqckFpeXR5JMlplCteZh0CpiW4XVr56rtA9fztgxdNk ZAqfLESV2ph/3KvEezYt9x43srWchBPL3c/R76c63dG5UyQ+wa3n/DtkEPiFTOYffp6c xysw== X-Gm-Message-State: AOAM531Whcpuf+B/UzF20+wmw8wdCAgqRfEdx+NT/W1xikXJh4ClgF61 ghVIZ9ARseFriymxHHlSnwg= X-Google-Smtp-Source: ABdhPJyQCNcXPALLtsaSChJREBuDx2EhUINyLjxIlggzxpRiWaifhNvs3OKhAWzagPxFLrKVgRmOUA== X-Received: by 2002:a05:6402:5cd:b0:412:d3fe:843d with SMTP id n13-20020a05640205cd00b00412d3fe843dmr37286851edx.97.1646342234674; Thu, 03 Mar 2022 13:17:14 -0800 (PST) Received: from [192.168.0.74] ([178.233.26.119]) by smtp.gmail.com with ESMTPSA id g11-20020a170906538b00b006ae38eb0561sm1094128ejo.195.2022.03.03.13.17.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 03 Mar 2022 13:17:14 -0800 (PST) Message-ID: <6d32aa01-9940-c112-af3e-b0fd9c39652d@gmail.com> Date: Fri, 4 Mar 2022 00:10:35 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 From: Alper Nebi Yasak Subject: Re: [PATCH v2 19/25] binman: Keep a separate list of entries for fit To: Simon Glass Cc: Ivan Mikhaylov , Tom Rini , Philippe Reynes , huang lin , Jeffy Chen , Kever Yang , U-Boot Mailing List References: <20220223230040.159317-1-sjg@chromium.org> <20220223230040.159317-20-sjg@chromium.org> Content-Language: en-US In-Reply-To: <20220223230040.159317-20-sjg@chromium.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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.5 at phobos.denx.de X-Virus-Status: Clean On 24/02/2022 02:00, Simon Glass wrote: > The current implementation sets up the FIT entries but then deletes the > 'generator' ones so they don't appear in the final image. They still show up in the fdtmap if I add one to rockchip-u-boot.dtsi: $ binman ls -i u-boot-rockchip.bin Name Image-pos Size Entry-type Offset ------------------------------------------------------------- main-section 0 103520 section 0 mkimage 0 1a000 mkimage 0 fit 1a000 e8d74 fit 1a000 u-boot 1a644 b1898 section 644 u-boot-nodtb 1a644 b1898 u-boot-nodtb 0 @atf-SEQ 0 0 section 0 atf-bl31 0 0 atf-bl31 0 @tee-SEQ 0 0 section 0 tee-os 0 0 tee-os 0 @fdt-SEQ 0 0 section 0 fdtmap 102d74 79c fdtmap 102d74 But not simple-bin.map: ImagePos Offset Size Name 00000000 00000000 00103520 main-section 00000000 00000000 0001a000 mkimage 0001a000 0001a000 000e8d74 fit 0001a644 00000644 000b1898 u-boot 0001a644 00000000 000b1898 u-boot-nodtb 00102d74 00102d74 0000079c fdtmap This happens in v1 as well, but I hadn't checked it then. (The "fit" size and "fdtmap" offset are off by 0x10 too, but I'm not sure why yet.) > This is a bit clumsy. We cannot build the image more than once, since the > generator entries are lost during the first build. Binman requires that > calling BuildSectionData() multiple times returns a valid result each > time. I think the generator entries should be turned into concrete entries and be removed in _gen_entries(), so BuildSectionData() should work on the entries that were generated. This way the individual entries would show up in fdtmap and could be binman-extracted/replaced as well. For FDTs we can generate blob entries for each file, for ELFs maybe we can split them into files like the script used to do (bl31_0x.bin) and do the same? Maybe some new entry types, "data" for arbitrary data unrelated to a file whose contents we can set, or "elf-segment" that can extract a segment from an ELF file (but I don't like the information loss there). > Keep a separate, private list which includes the generator nodes and use > that where needed, to correct this problem. Ensure that the missing list > includes removed generator entries too. > > Signed-off-by: Simon Glass > --- > > (no changes since v1) I'm more and more convinced that generator nodes needs a thorough redesign, but the patch is consistent with status quo, so: Reviewed-by: Alper Nebi Yasak > tools/binman/etype/fit.py | 33 ++++++++++++++++++++++++++++----- > 1 file changed, 28 insertions(+), 5 deletions(-) > > diff --git a/tools/binman/etype/fit.py b/tools/binman/etype/fit.py > index e1b056f56e..30b20a07a2 100644 > --- a/tools/binman/etype/fit.py > +++ b/tools/binman/etype/fit.py > @@ -163,10 +163,15 @@ class Entry_fit(Entry_section): > key: relative path to entry Node (from the base of the FIT) > value: Entry_section object comprising the contents of this > node > + _priv_entries: Internal copy of _entries which includes 'generator' > + entries which are used to create the FIT, but should not be > + processed as real entries. This is set up once we have the > + entries Maybe this could be "_templates" or "_entry_generators" and only keep track of the generator entries. > """ > super().__init__(section, etype, node) > self._fit = None > self._fit_props = {} > + self._priv_entries = {} > > for pname, prop in self._node.props.items(): > if pname.startswith('fit,'): > > [...]