Re: [U-Boot] [PATCH v4 2/9] spl: Use u-boot.img instead of u-boot.bin

2014-12-11 Thread York Sun
On 12/02/2014 11:00 PM, Alison Wang wrote:
 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.w...@freescale.com
 ---
 Change log:
  v4: No change.
  v3: No change.
  v2: No change.
 

Applied to u-boot-fsl-qoriq master, awaiting upstream.

York


___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] [PATCH v4 2/9] spl: Use u-boot.img instead of u-boot.bin

2014-12-02 Thread Alison Wang
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.w...@freescale.com
---
Change log:
 v4: No change.
 v3: No change.
 v2: No change.

 Makefile | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b1a8acd..0d83fbf 100644
--- a/Makefile
+++ b/Makefile
@@ -1022,10 +1022,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
-- 
2.1.0.27.g96db324

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot