[PATCH] Makefile: binman: Search board directory before srctree

[Simon Glass]

Hi Tom,

On Fri, 15 May 2026 at 08:54, Tom Rini <trini at konsulko.com> wrote:
>
> On Fri, May 15, 2026 at 07:43:27AM +0200, Wadim Egorov wrote:
>
> > A file like rm-cfg.yaml accidentally left in the source tree root
> > shadows the board-specific copy. binman builds the wrong YAML, the
> > resulting rm-cfg.bin may match a different SoC, and we end up with
> > the following error:
> >
> >   k3_system_controller sysctrler: k3_sysctrler_start:
> >       Boot Notification response failed. ret = -110
> >
> > Move the board directory ahead of the srctree root so that the
> > most-specific match wins.
> >
> > Signed-off-by: Wadim Egorov <w.egorov at phytec.de>
> > ---
> >  Makefile | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/Makefile b/Makefile
> > index 552328f9f2c..1ec29dfe0be 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -1682,7 +1682,7 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \
> >               build -u -d $(binman_dtb) -O . -m \
> >               --allow-missing --fake-ext-blobs \
> >               $(if $(BINMAN_ALLOW_MISSING),--ignore-missing) \
> > -             -I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \
> > +             -I . -I $(srctree)/board/$(BOARDDIR) -I $(srctree) \
> >               $(foreach f,$(of_list_dirs),-I $(f)) -a of-list=$(of_list) \
> >               $(foreach f,$(BINMAN_INDIRS),-I $(f)) \
> >               -a atf-bl1-path=${BL1} \
>
> Why do we need to look in $(srctree) itself?

See for example:

arch/arm/dts/k3-j721e-binman.dtsi:308:  private-key =
"arch/arm/mach-k3/keys/custMpk.pem";

Also, people sometimes put files in the source tree, e.g. BL31 images,
in the hope that they will be found.

Regards,
Simon