aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-03-03 10:10:34 -0500
committerTom Rini <trini@konsulko.com>2021-03-03 10:10:34 -0500
commit52ba373b7825e9feab8357065155cf43dfe2f4ff (patch)
treee703b3feae721de7a97b547ee3a0f1e628219d0e /Makefile
parent23ab54e0933939d201d7c200503bc149128a13db (diff)
parent03bf8436a3a5b19ff4ae23868dd479acc050ff08 (diff)
downloadu-boot-52ba373b7825e9feab8357065155cf43dfe2f4ff.zip
u-boot-52ba373b7825e9feab8357065155cf43dfe2f4ff.tar.gz
u-boot-52ba373b7825e9feab8357065155cf43dfe2f4ff.tar.bz2
Merge tag 'u-boot-imx-20210303' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
i.MX for 2021.04 ---------------- - new boards: - i.MX8MN Beacon EmbeddedWorks (2GB) - Gateworks Venice imx8mm - convert to DM: - imx53-qsb, mx53loco, mx51evk, mx23-evk - Fixes : - Network : FEC ethernet quirks - DH dh-imx6 CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/6597
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 2581cfb..68ce519 100644
--- a/Makefile
+++ b/Makefile
@@ -1548,7 +1548,10 @@ flash.bin: spl/u-boot-spl.bin u-boot.itb FORCE
endif
endif
-u-boot-with-spl.imx u-boot-with-nand-spl.imx: SPL u-boot.bin FORCE
+u-boot.uim: u-boot.bin FORCE
+ $(Q)$(MAKE) $(build)=arch/arm/mach-imx $@
+
+u-boot-with-spl.imx u-boot-with-nand-spl.imx: SPL $(if $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE
$(Q)$(MAKE) $(build)=arch/arm/mach-imx $@
MKIMAGEFLAGS_u-boot.ubl = -n $(UBL_CONFIG) -T ublimage -e $(CONFIG_SYS_TEXT_BASE)