summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlison Wang <b18965@freescale.com>2014-12-03 15:00:42 +0800
committerYork Sun <yorksun@freescale.com>2014-12-11 09:37:48 -0800
commit45c2e480edd5360c46f92bfb7e8ca6ac4554767f (patch)
tree0f5a5f66197be539dfc5e842227e8ae3ba491f58
parent94cb17d0786867b8bffb684adb48f7111d9d5b63 (diff)
downloadu-boot-imx-45c2e480edd5360c46f92bfb7e8ca6ac4554767f.zip
u-boot-imx-45c2e480edd5360c46f92bfb7e8ca6ac4554767f.tar.gz
u-boot-imx-45c2e480edd5360c46f92bfb7e8ca6ac4554767f.tar.bz2
spl: Use u-boot.img instead of u-boot.bin
In SD boot, the magic number of u-boot image will be checked. For LS102xA, u-boot.bin doesn't have the magic number. So use u-boot.img which includes the magic number instead of u-boot.bin when producing u-boot-with-spl-pbl.bin. Signed-off-by: Alison Wang <alison.wang@freescale.com> Reviewed-by: York Sun <yorksun@freescale.com>
-rw-r--r--Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d3e99e5..63eccc2 100644
--- a/Makefile
+++ b/Makefile
@@ -1005,10 +1005,16 @@ MKIMAGEFLAGS_u-boot-spl.pbl = -n $(srctree)/$(CONFIG_SYS_FSL_PBL_RCW:"%"=%) \
spl/u-boot-spl.pbl: spl/u-boot-spl.bin FORCE
$(call if_changed,mkimage)
+ifeq ($(ARCH),arm)
+UBOOT_BINLOAD := u-boot.img
+else
+UBOOT_BINLOAD := u-boot.bin
+endif
+
OBJCOPYFLAGS_u-boot-with-spl-pbl.bin = -I binary -O binary --pad-to=$(CONFIG_SPL_PAD_TO) \
--gap-fill=0xff
-u-boot-with-spl-pbl.bin: spl/u-boot-spl.pbl u-boot.bin FORCE
+u-boot-with-spl-pbl.bin: spl/u-boot-spl.pbl $(UBOOT_BINLOAD) FORCE
$(call if_changed,pad_cat)
# PPC4xx needs the SPL at the end of the image, since the reset vector