aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlison Wang2014-12-03 01:00:42 -0600
committerYork Sun2014-12-11 11:37:48 -0600
commit45c2e480edd5360c46f92bfb7e8ca6ac4554767f (patch)
tree0f5a5f66197be539dfc5e842227e8ae3ba491f58 /Makefile
parent94cb17d0786867b8bffb684adb48f7111d9d5b63 (diff)
downloadu-boot-45c2e480edd5360c46f92bfb7e8ca6ac4554767f.tar.gz
u-boot-45c2e480edd5360c46f92bfb7e8ca6ac4554767f.tar.xz
u-boot-45c2e480edd5360c46f92bfb7e8ca6ac4554767f.zip
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d3e99e5865..63eccc2364 100644
--- a/Makefile
+++ b/Makefile
@@ -1005,10 +1005,16 @@ MKIMAGEFLAGS_u-boot-spl.pbl = -n $(srctree)/$(CONFIG_SYS_FSL_PBL_RCW:"%"=%) \
1005spl/u-boot-spl.pbl: spl/u-boot-spl.bin FORCE 1005spl/u-boot-spl.pbl: spl/u-boot-spl.bin FORCE
1006 $(call if_changed,mkimage) 1006 $(call if_changed,mkimage)
1007 1007
1008ifeq ($(ARCH),arm)
1009UBOOT_BINLOAD := u-boot.img
1010else
1011UBOOT_BINLOAD := u-boot.bin
1012endif
1013
1008OBJCOPYFLAGS_u-boot-with-spl-pbl.bin = -I binary -O binary --pad-to=$(CONFIG_SPL_PAD_TO) \ 1014OBJCOPYFLAGS_u-boot-with-spl-pbl.bin = -I binary -O binary --pad-to=$(CONFIG_SPL_PAD_TO) \
1009 --gap-fill=0xff 1015 --gap-fill=0xff
1010 1016
1011u-boot-with-spl-pbl.bin: spl/u-boot-spl.pbl u-boot.bin FORCE 1017u-boot-with-spl-pbl.bin: spl/u-boot-spl.pbl $(UBOOT_BINLOAD) FORCE
1012 $(call if_changed,pad_cat) 1018 $(call if_changed,pad_cat)
1013 1019
1014# PPC4xx needs the SPL at the end of the image, since the reset vector 1020# PPC4xx needs the SPL at the end of the image, since the reset vector