From 393fb8a1c434dca96eb01a641412c8214c357a27 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan.agner@toradex.com>
Date: Thu, 16 Oct 2014 09:50:12 +0200
Subject: imx: add u-boot-nand.imx target

Add an additional target which prepends the u-boot.imx image with
0x400 padding bytes. On Vybrid, this is required for NAND boot
devices. The configuration CONFIG_IMX_NAND enables this image
for a board.
---
 Makefile                     | 3 +++
 arch/arm/config.mk           | 5 +++++
 arch/arm/imx-common/Makefile | 9 +++++++++
 3 files changed, 17 insertions(+)

diff --git a/Makefile b/Makefile
index 99097e1e57..b704a3ff55 100644
--- a/Makefile
+++ b/Makefile
@@ -786,6 +786,9 @@ u-boot-dtb.bin: u-boot.bin dts/dt.dtb FORCE
 %.imx: %.bin
 	$(Q)$(MAKE) $(build)=arch/arm/imx-common $@
 
+u-boot-nand.imx: u-boot.bin
+	$(Q)$(MAKE) $(build)=arch/arm/imx-common $@
+
 quiet_cmd_copy = COPY    $@
       cmd_copy = cp $< $@
 
diff --git a/arch/arm/config.mk b/arch/arm/config.mk
index c339e6dc8c..f0eafd6307 100644
--- a/arch/arm/config.mk
+++ b/arch/arm/config.mk
@@ -129,7 +129,12 @@ else
 ifeq ($(CONFIG_OF_SEPARATE),y)
 ALL-y += u-boot-dtb.imx
 else
+ifeq ($(CONFIG_IMX_NAND),y)
+# u-boot-nand.imx builds u-boot.imx as well
+ALL-y += u-boot-nand.imx
+else
 ALL-y += u-boot.imx
 endif
 endif
 endif
+endif
diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile
index b458814764..132de990ac 100644
--- a/arch/arm/imx-common/Makefile
+++ b/arch/arm/imx-common/Makefile
@@ -44,6 +44,15 @@ MKIMAGEFLAGS_u-boot.imx = -n $(filter-out $< $(PHONY),$^) -T imximage \
 u-boot.imx: u-boot.bin $(IMX_CONFIG) FORCE
 	$(call if_changed,mkimage)
 
+ifeq ($(CONFIG_IMX_NAND),y)
+quiet_cmd_u-boot-nand_imx = GEN     $@
+cmd_u-boot-nand_imx = (dd bs=1024 count=1 if=/dev/zero 2>/dev/null) | \
+       cat - $< > $@
+
+u-boot-nand.imx: u-boot.imx $(IMX_CONFIG) FORCE
+	$(call if_changed,u-boot-nand_imx)
+endif
+
 ifeq ($(CONFIG_OF_SEPARATE),y)
 MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $< $(PHONY),$^) -T imximage \
 	-e $(CONFIG_SYS_TEXT_BASE)
-- 
cgit v1.2.3