aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-05-11 12:23:11 -0400
committerTom Rini <trini@konsulko.com>2021-05-11 12:23:11 -0400
commit59a2b9e605c5a5e2dff35506a13b51f33d3051b4 (patch)
tree016d452dff11fc6fd90192d56e575d28757504c3 /Makefile
parent838157d02edade9bfaa33da216bf109336ab9547 (diff)
parent7666cccf4f24dd500a9279741a0b64a3f89a7331 (diff)
downloadu-boot-59a2b9e605c5a5e2dff35506a13b51f33d3051b4.zip
u-boot-59a2b9e605c5a5e2dff35506a13b51f33d3051b4.tar.gz
u-boot-59a2b9e605c5a5e2dff35506a13b51f33d3051b4.tar.bz2
Merge tag 'u-boot-imx-20210502' of https://gitlab.denx.de/u-boot/custodians/u-boot-imxWIP/11May2021
u-boot-imx-20210502 ------------------- - mx6: fixes for Ventana - local fixes from maintainer - imx7d: Ronetix's iMX7-CM - imx8: Ronetix iMX8MQ-CM Engicam i.Core MX8M Compulab iot-gate-imx8 - Fixes i.MX8 documentation - Fixes phy usage with fec
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index dd12a47..559594f 100644
--- a/Makefile
+++ b/Makefile
@@ -1491,10 +1491,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 $@