From mboxrd@z Thu Jan 1 00:00:00 1970 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 55B10C433EF for ; Mon, 28 Feb 2022 13:56:47 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 265BF838D6; Mon, 28 Feb 2022 14:56:45 +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="clqlk0aI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1648F83BE8; Mon, 28 Feb 2022 14:56:33 +0100 (CET) Received: from mail-vs1-xe30.google.com (mail-vs1-xe30.google.com [IPv6:2607:f8b0:4864:20::e30]) (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 515358309C for ; Mon, 28 Feb 2022 14:56:26 +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@google.com Received: by mail-vs1-xe30.google.com with SMTP id q9so13040610vsg.2 for ; Mon, 28 Feb 2022 05:56:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=pJt8lJA3TmRdDlcS3lIkj+EMrzVwVOCRnAiaFBI7WVk=; b=clqlk0aIxjXFxPFRs0Wzqw/mAJB7Ac0Pl6I4mpj2cPoRgPYK+eL7OoaXNGIzYTH31M gk0xXz3Hrn2frCJfowFEn95THqXjLvEr2esRtFcZqw5BzuJooQAsaAiw79KDzB9s8v09 7/FUEaTxpcds7L0jeKOtKKoaP7u/RTSx2coI4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=pJt8lJA3TmRdDlcS3lIkj+EMrzVwVOCRnAiaFBI7WVk=; b=tdD9HLMMq4z8qp8KzZ3yt+FuomiwLVb7IOeqlA9LuYk1fbllaJnixzLuWl7amm0qPp Njp6X8REhnSNVxIenwNqkpVlqMK6OmqPTAOOYwjGeqEVrcrzuehvUVdOLoTqLvWlE4XS NVr6RDNd2T7wMy5oX59j4eT+APxHIDpZA4XFL1zbEsbsR8FCBW5mJ+QTQ3bhhxEKIJX+ jnjOJNCfk/DywnEVfKeOkc1AWV6EGiplcCCinpPuIAjlb/gII7JUtyUlevYvTMnBRUJ2 ty9vgZ9plE3XCjDB7iMl5HFpFPzRyisVolvI3KeF/KGsOiZCmluOQJWN7d2gyptwyL0w c1mA== X-Gm-Message-State: AOAM532SmuHcowt2X3DaK3UIfjDbDCBLoGKCnC8M4fCJWojjP998np2J Fuaa9xvA4s0N3OVUR92xfa9zV/MmF9OisKaHSH70eAoVMQA= X-Google-Smtp-Source: ABdhPJy6ZdIebvXoQ8hhkB1Z02t7aQyfB0ay3OsW4BIHJeRxEcVu9QiVUb0WgetiI2XA0n4IK5XJjDNcNILDk1nxyNg= X-Received: by 2002:a67:e14d:0:b0:31b:9356:40ff with SMTP id o13-20020a67e14d000000b0031b935640ffmr7751143vsl.51.1646056584805; Mon, 28 Feb 2022 05:56:24 -0800 (PST) MIME-Version: 1.0 References: <20220207220809.4497-1-alpernebiyasak@gmail.com> <20220207220809.4497-5-alpernebiyasak@gmail.com> <1c7e5656-87f8-7d87-cb50-aead7b9a5ff1@siemens.com> <3d176bab-dc74-3ee2-9014-81401971ba8d@siemens.com> <10793ff6-12b6-7b3b-840b-c6f49f9185da@siemens.com> In-Reply-To: From: Simon Glass Date: Mon, 28 Feb 2022 06:56:13 -0700 Message-ID: Subject: Re: [PATCH v2 4/5] binman: Convert FIT entry type to a subclass of Section entry type To: Jan Kiszka Cc: Alper Nebi Yasak , U-Boot Mailing List , Heiko Thiery Content-Type: text/plain; charset="UTF-8" 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 Hi Jan, On Mon, 28 Feb 2022 at 04:48, Jan Kiszka wrote: > > On 23.02.22 23:59, Simon Glass wrote: > > Hi Alper, > > > > On Tue, 22 Feb 2022 at 11:58, Alper Nebi Yasak wrote: > >> > >> On 21/02/2022 07:40, Simon Glass wrote: > >>> On Sat, 19 Feb 2022 at 08:53, Simon Glass wrote: > >>>> On Fri, 18 Feb 2022 at 10:34, Alper Nebi Yasak wrote: > >>>>> I can reproduce this and tried a few things, but more issues just kept > >>>>> popping up (outside u-boot as well). I got it to a point where the > >>>>> command re-packs the FIT and the image but quite wrongly. The offset and > >>>>> image-pos properties get added in the FIT, and the image main-section > >>>>> just concatenates all entries without regard to set offsets. I'll > >>>>> need more time to work those out, then to add tests and send patches. > >>>> > >>>> I am going to try to merge my fit generator series today. > >>>> > >>>> One issue I notice is that the conversion to use entry_Section changes > >>>> the contents of the self._fit_entries dict. Before it was keyed by > >>>> relative path, but entry_section keys self._entries by node name. > >> > >> Yeah, this causes an error in image.FindEntryPath() while trying to > >> replace e.g. "/fit@0x280000/images/u-boot" since there is no "images" > >> entry in the FIT. Changing the key to the node name works, but then the > >> "binman replace" invocation needs to use e.g. "/fit@0x280000/u-boot". > >> > >>>> > >>>> We may need to split it up. I will see if I can at least merge my > >>>> series, which should not make things any worse, then see if I can come > >>>> up with ideas. > >>>> > >>>> Thanks for the diff. > >>> > >>> I did a bit more fiddling and pushed a tree to u-boot-dm/fit-working > >>> > >>> It refactors the fit implementation to separate scanning from emitting > >>> the tree and I think this might help quite a bit. I'll send out the > >>> series when I get a chance in the next few days or so. > >> > >> I've also managed to somewhat fix the rest of the issues I wrote, so now > >> I can replace a FIT entry with a modified one (having a different u-boot > >> file), or replace a subentry of the FIT with an arbitrary file. > >> > >> I couldn't look at your new version much but I'll try to see how good my > >> fixes apply on top of it, will probably take me longer to patchify things. > > > > OK I'm going to send a new series with (most of) your suggested fixes > > a new patches, then my refactoring. Just need to get things through > > CI. > > > > What's the status here? I've just rebased over master, a simple revert > of this commit no longer works, and the regression is still present. Are > there any pending patches that fixes this and I should pick locally in > order to rebase/test my pending things? Please see this series and review if you can: https://patchwork.ozlabs.org/user/todo/uboot/?series=287681 I did not add a test for your issue though. Can you take a look? Regards, Simon