binman: u-boot-dtb vs. filename

[Simon Glass]

Hi Jan,

On Sat, 21 Nov 2020 at 07:28, Jan Kiszka <jan.kiszka at web.de> wrote:
>
> Hi,
>
> I stumbled over README.entries claiming
>
> Entry: u-boot-dtb: U-Boot device tree
> -------------------------------------
>
> Properties / Entry arguments:
>     - filename: Filename of u-boot.dtb (default 'u-boot.dtb')
>
>
> However,
>
>         u-boot-dtb {
>                 filename = "foo.dtb"
>         }
>
> only pulls u-boot.dtb. Tried to fix that but I failed to understand the
> binman logic. Maybe the documentation (also that of
> u-boot-dtb-with-ucode) was just not supposed to refer to filename.
>
> Using 'blob' now, like other boards.

This was by design, since it is trying to pick up a particular .dtb
file, but as you point out the docs do not match. I wonder if using
'blob-dtb' as the entry type would work?

The reason is that Entry_u_boot_dtb has a GetDefaultFilename()
function and that ignores the filename property.

I suspect that changing it to:

    def GetDefaultFilename(self):
       return self._filename or 'u-boot.dtb'

might work too. I will have a think about which fix is best and see if
I can add a test to ftest.py

Regards,
Simon