[PATCH v2 08/11] binman: Support packaging U-Boot for scenarios like OF_PRIOR_STAGE

[Bin Meng]

On Sun, May 9, 2021 at 12:48 AM Simon Glass <sjg at chromium.org> wrote:
>
> Hi Bin,
>
> On Sat, 8 May 2021 at 08:55, Bin Meng <bmeng.cn at gmail.com> wrote:
> >
> > Hi Simon,
> >
> > On Sat, May 8, 2021 at 11:47 PM Simon Glass <sjg at chromium.org> wrote:
> > >
> > > Hi Bin,
> > >
> > > On Sat, 8 May 2021 at 08:15, Bin Meng <bmeng.cn at gmail.com> wrote:
> > > >
> > > > For scenarios like OF_PRIOR_STAGE, no device tree blob is provided
> > > > in the U-Boot build phase hence the binman node information is not
> > > > available. In order to support such use case, a new Kconfig option
> > > > BINMAN_DTB is introduced, to tell U-Boot build system that a device
> > > > tree blob is explicitly required when using binman to package U-Boot.
> > > >
> > > > Signed-off-by: Bin Meng <bmeng.cn at gmail.com>
> > > >
> > > > ---
> > > >
> > > > Changes in v2:
> > > > - new patch: "binman: Support packaging U-Boot for scenarios like OF_PRIOR_STAGE"
> > > >
> > > >  Makefile    |  3 ++-
> > > >  dts/Kconfig | 18 ++++++++++++++++++
> > > >  lib/Kconfig |  2 +-
> > > >  3 files changed, 21 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/Makefile b/Makefile
> > > > index 3d88559b67..9043828675 100644
> > > > --- a/Makefile
> > > > +++ b/Makefile
> > > > @@ -918,6 +918,7 @@ endif
> > > >  endif
> > > >  INPUTS-$(CONFIG_TPL) += tpl/u-boot-tpl.bin
> > > >  INPUTS-$(CONFIG_OF_SEPARATE) += u-boot.dtb
> > > > +INPUTS-$(CONFIG_BINMAN_DTB) += u-boot.dtb
> > > >  ifeq ($(CONFIG_SPL_FRAMEWORK),y)
> > > >  INPUTS-$(CONFIG_OF_SEPARATE) += u-boot-dtb.img
> > > >  endif
> > > > @@ -1161,7 +1162,7 @@ u-boot-dtb.bin: u-boot-nodtb.bin dts/dt.dtb FORCE
> > > >  u-boot.bin: u-boot-dtb.bin FORCE
> > > >         $(call if_changed,copy)
> > > >  else
> > > > -u-boot.bin: u-boot-nodtb.bin FORCE
> > > > +u-boot.bin: u-boot-nodtb.bin $(if $(CONFIG_BINMAN_DTB),dts/dt.dtb) FORCE
>
> What is this change for, specifically? Can you add a comment?
>

Oops, I missed this comment. Sure.

> It seems to be overriding the qemu thing of not actually building a DT?

This is to make sure the dependency is met (ie: the *faked* DT
containing binman node gets built first) otherwise it may fail in a
parallel build.

Regards,
Bin