From: Wadim Egorov Date: Fri, 15 May 2026 05:43:27 +0000 (+0200) Subject: Makefile: binman: Search board directory before srctree X-Git-Tag: v2026.07-rc3~1 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=a20893480124414befecbc0200cb329a0fdf094e;p=thirdparty%2Fu-boot.git Makefile: binman: Search board directory before srctree 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 Reviewed-by: Simon Glass --- diff --git a/Makefile b/Makefile index 7e87b4f65f2..71d28d06bb8 100644 --- a/Makefile +++ b/Makefile @@ -1685,7 +1685,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} \