summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMarek Vasut <[email protected]>2025-12-28 20:43:21 +0100
committerFabio Estevam <[email protected]>2025-12-29 10:17:01 -0300
commit253a96ffb66a931f72a3e8ace0fcb5ec87e0e4e5 (patch)
tree4d8cf63abdedfafae17b831d29f3dfe5278d9b04 /Makefile
parentf0109936060973ca56be78d0c29681d13686ad4d (diff)
Makefile: Make flash.bin target available on i.MX9
The current implementation of flash.bin generation with CONFIG_SPL_LOAD_IMX_CONTAINER=y requires build of u-boot.cnt which is i.MX8 specific. Reinstate the i.MX8 check to avoid this dependency for i.MX9 . Fill in flash.bin target for i.MX9 into imx specific Makefile. Fixes: c3587197c0c9 ("Makefile: Make flash.bin target available for all platforms") Signed-off-by: Marek Vasut <[email protected]>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 8cb9a06f6a4..6b5c5ee019e 100644
--- a/Makefile
+++ b/Makefile
@@ -1778,14 +1778,18 @@ tpl/u-boot-with-tpl.bin: tpl/u-boot-tpl.bin u-boot.bin FORCE
SPL: spl/u-boot-spl.bin FORCE
$(Q)$(MAKE) $(build)=arch/arm/mach-imx $@
-#ifeq ($(CONFIG_ARCH_IMX8M)$(CONFIG_ARCH_IMX8), y)
-ifeq ($(CONFIG_SPL_LOAD_IMX_CONTAINER), y)
+ifeq ($(CONFIG_SPL_LOAD_IMX_CONTAINER),y)
+ifeq ($(CONFIG_ARCH_IMX8M)$(CONFIG_ARCH_IMX8),y)
u-boot.cnt: u-boot.bin FORCE
$(Q)$(MAKE) $(build)=arch/arm/mach-imx $@
flash.bin: spl/u-boot-spl.bin u-boot.cnt FORCE
$(Q)$(MAKE) $(build)=arch/arm/mach-imx $@
else
+flash.bin: spl/u-boot-spl.bin FORCE
+ $(Q)$(MAKE) $(build)=arch/arm/mach-imx $@
+endif
+else
ifeq ($(CONFIG_BINMAN),y)
flash.bin: spl/u-boot-spl.bin $(INPUTS-y) FORCE
$(call if_changed,binman)
@@ -1794,7 +1798,6 @@ 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 $@