summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2021-02-25 23:50:59 +0300
committerStefano Babic <sbabic@denx.de>2021-05-02 13:12:42 +0300
commitbd9059c477e5eafbad08ef24923222a191bc98a0 (patch)
treedf437010dc834d208013a3e73360a1b38e2f209c /Makefile
parent8ddaf943589756442bba21e5be645cd47526d82b (diff)
downloadu-boot-bd9059c477e5eafbad08ef24923222a191bc98a0.tar.xz
Makefile: Fix generation of flash.bin u-boot.itb with binman
In case binman is enabled, the u-boot.itb is generated using this tool and there is no direct u-boot.itb target, but instead the binman tool must be invoked. Add support for this case. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Peng Fan <peng.fan@nxp.com> Cc: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 404977efa5..0486f2e59c 100644
--- a/Makefile
+++ b/Makefile
@@ -1493,10 +1493,16 @@ u-boot.cnt: u-boot.bin FORCE
flash.bin: spl/u-boot-spl.bin u-boot.cnt FORCE
$(Q)$(MAKE) $(build)=arch/arm/mach-imx $@
else
+ifeq ($(CONFIG_BINMAN),y)
+flash.bin: spl/u-boot-spl.bin $(INPUTS-y) FORCE
+ $(call if_changed,binman)
+ $(Q)$(MAKE) $(build)=arch/arm/mach-imx $@
+else
flash.bin: spl/u-boot-spl.bin u-boot.itb FORCE
$(Q)$(MAKE) $(build)=arch/arm/mach-imx $@
endif
endif
+endif
u-boot.uim: u-boot.bin FORCE
$(Q)$(MAKE) $(build)=arch/arm/mach-imx $@