@@ -253,6 +253,7 @@ config BUILD_TARGET
default "u-boot.itb" if SPL_LOAD_FIT && (ROCKCHIP_RK3399 || ARCH_SUNXI)
default "u-boot.kwb" if KIRKWOOD
default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
+ default "u-boot-nand.imx" if (ARCH_MX6 || ARCH_MX7) || NAND_BOOT
help
Some SoCs need special image types (e.g. U-Boot binary
with a special header) as build targets. By defining
@@ -1106,6 +1106,9 @@ endif
%.vyb: %.imx
$(Q)$(MAKE) $(build)=arch/arm/cpu/armv7/vf610 $@
+u-boot-nand.imx: u-boot.imx
+ $(Q)$(MAKE) $(build)=arch/arm/mach-imx $@
+
quiet_cmd_copy = COPY $@
cmd_copy = cp $< $@
@@ -112,6 +112,13 @@ u-boot.imx: MKIMAGEOUTPUT = u-boot.imx.log
u-boot.imx: u-boot.bin u-boot.cfgout $(PLUGIN).bin FORCE
$(call if_changed,mkimage)
+ifeq ($(CONFIG_NAND_BOOT),y)
+cmd_u-boot-nand_imx = (dd bs=1024 count=1 if=/dev/zero 2>/dev/null) | \
+ cat - $< > $@
+u-boot-nand.imx: u-boot.imx FORCE
+ $(call if_changed,u-boot-nand_imx)
+endif
+
ifeq ($(CONFIG_MULTI_DTB_FIT),y)
MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) \
-T $(IMAGE_TYPE) -e $(CONFIG_SYS_TEXT_BASE)