| Message ID | 20190719172117.113762-1-swarren@wwwdotorg.org |
|---|---|
| State | Accepted |
| Commit | 4f4fb85ec0bfe45da11aa23ada565387ee676e80 |
| Delegated to: | Simon Glass |
| Headers | show |
| Series | [U-Boot] Makefile: fix implementation of BINMAN_DEBUG | expand |
On Fri, 19 Jul 2019 at 11:21, Stephen Warren <swarren@wwwdotorg.org> wrote: > > From: Stephen Warren <swarren@nvidia.com> > > binman only accepts the -D argument early on the command-line, yet the > Makefile currently passes it near the end. This causes the build to fail > if this feature is used. Re-order the command-line to fix this. > > Signed-off-by: Stephen Warren <swarren@nvidia.com> > --- > Note: This appears to be a change introduced in u-boot-dm.git master; > the binman currently in u-boot.git master doesn't seem to need this. > --- > Makefile | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org> Thanks
On Fri, 19 Jul 2019 at 11:21, Stephen Warren <swarren@wwwdotorg.org> wrote: > > From: Stephen Warren <swarren@nvidia.com> > > binman only accepts the -D argument early on the command-line, yet the > Makefile currently passes it near the end. This causes the build to fail > if this feature is used. Re-order the command-line to fix this. > > Signed-off-by: Stephen Warren <swarren@nvidia.com> > --- > Note: This appears to be a change introduced in u-boot-dm.git master; > the binman currently in u-boot.git master doesn't seem to need this. > --- > Makefile | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org> Thanks Applied to u-boot-dm, thanks!
diff --git a/Makefile b/Makefile index 704579bec193..5906871ef27f 100644 --- a/Makefile +++ b/Makefile @@ -1196,9 +1196,10 @@ u-boot.ldr: u-boot # --------------------------------------------------------------------------- # Use 'make BINMAN_DEBUG=1' to enable debugging quiet_cmd_binman = BINMAN $@ -cmd_binman = $(srctree)/tools/binman/binman build -u -d u-boot.dtb -O . -m \ +cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ + build -u -d u-boot.dtb -O . -m \ -I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \ - $(if $(BINMAN_DEBUG),-D) $(BINMAN_$(@F)) + $(BINMAN_$(@F)) OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihex