From: Michal Simek <michal.simek@xilinx.com>
Date: Wed, 16 Jan 2019 11:14:00 +0000 (+0100)
Subject: arm64: zynqmp: Align u-boot-spl.bin for boot.bin creation
X-Git-Tag: v2019.04-rc1~28^2~14
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a903dcf7dee787320d7cfee969de322ac7a30ee1;p=oweals%2Fu-boot.git

arm64: zynqmp: Align u-boot-spl.bin for boot.bin creation

Bootrom is not capable to work with non align bootloader partition
that's why it is necessary to align it before boot.bin creation.
The patch is creating new spl/u-boot-spl-align.bin which is used only
for boot.bin.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index 29626e0025..e5b604e2d2 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -190,7 +190,10 @@ MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \
 	-n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))"
 endif
 
-spl/boot.bin: $(obj)/u-boot-spl.bin FORCE
+$(obj)/$(SPL_BIN)-align.bin: $(obj)/$(SPL_BIN).bin
+	@dd if=$< of=$@ conv=block,sync bs=4 2>/dev/null;
+
+spl/boot.bin: $(obj)/$(SPL_BIN)-align.bin FORCE
 	$(call if_changed,mkimage)
 endif