[PATCH v4 09/20] binman: Convert mkimage to Entry_section

[Simon Glass]

Hi Jonas,

On Tue, 11 Jul 2023 at 10:52, Jonas Karlman <jonas at kwiboo.se> wrote:
>
> Hi Simon,
>
> On 2023-07-11 16:59, Simon Glass wrote:
> > From: Marek Vasut <marex at denx.de>
> >
> > This is needed to handle mkimage with inner section located itself in a
> > section.
> >
> > Signed-off-by: Marek Vasut <marex at denx.de>
> > Use BuildSectionData() instead of ObtainContents(), add tests and a few
> > other minor fixes:
> > Signed-off-by: Simon Glass <sjg at chromium.org>
> > ---
> >
> > (no changes since v3)
> >
> > Changes in v3:
> > - Fix up some tests which now need SPL and TPL
> > - Avoid calling ObtainContents() when not needed
> >
> > Changes in v2:
> > - Drop now-unnecessary methods in mkimage etype
>
> Still looks like this change never made it into the v4 patch?
>
> The following functions are still in this file and should be removed:
> - SetAllowMissing
> - SetAllowFakeBlob
> - CheckMissing
> - CheckFakedBlobs

Thanks for spotting this again. I've pushed a v5 with that change, so
hopefully I will do it correctly when I send those patches.

>
> >
> >  tools/binman/entry.py                     |  6 +-
> >  tools/binman/etype/mkimage.py             | 71 ++++++++++++++---------
> >  tools/binman/ftest.py                     | 69 +++++++++++++++++++++-
> >  tools/binman/test/283_mkimage_special.dts | 24 ++++++++
> >  4 files changed, 135 insertions(+), 35 deletions(-)
> >  create mode 100644 tools/binman/test/283_mkimage_special.dts
> >
>
> [...]
>
> > diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
> > index dabb3f689fdb..60e69443c400 100644
> > --- a/tools/binman/ftest.py
> > +++ b/tools/binman/ftest.py
>
> [...]
>
> > @@ -6696,6 +6754,13 @@ fdt         fdtmap                Extract the devicetree blob from the fdtmap
> >                            entry_args=entry_args, use_expanded=True,
> >                            no_write_symbols=True)
> >
> > +    def testMkimageSpecial(self):
> > +        """Test mkimage ignores special hash-1 node"""
> > +        data = self._DoReadFile('283_mkimage_special.dts')
> > +
> > +        # Just check that the data appears in the file somewhere
> > +        self.assertIn(U_BOOT_DATA, data)
> > +
> >
> > -if __name__ == "__main__":
> > +if __name__ == "_s_main__":
>
> This looks like an unintentional change.

Yes, fixed in a later commit and I didn't notice.

Regards,
Simon