diff options
| author | Tom Rini <trini@ti.com> | 2013-04-22 09:11:25 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-04-22 09:11:25 -0400 |
| commit | 7fbf93e6b8928119c8b3d87ab55739f50aea5552 (patch) | |
| tree | 2ebbb4d47d9bbc7149826815d96e2ca1b8eba0e3 /Makefile | |
| parent | fc180c743d84f882073948566ee324dcf0e9e22c (diff) | |
| parent | f47b048b3a283dca63cfdce46840dd477e591336 (diff) | |
| download | u-boot-imx-7fbf93e6b8928119c8b3d87ab55739f50aea5552.zip u-boot-imx-7fbf93e6b8928119c8b3d87ab55739f50aea5552.tar.gz u-boot-imx-7fbf93e6b8928119c8b3d87ab55739f50aea5552.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -554,6 +554,18 @@ endif $(obj)u-boot-img.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.img cat $(obj)spl/u-boot-spl.bin $(obj)u-boot.img > $@ +# PPC4xx needs the SPL at the end of the image, since the reset vector +# is located at 0xfffffffc. So we can't use the "u-boot-img.bin" target +# and need to introduce a new build target with the full blown U-Boot +# at the start padded up to the start of the SPL image. And then concat +# the SPL image to the end. +$(obj)u-boot-img-spl-at-end.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.img + tr "\000" "\377" < /dev/zero | dd ibs=1 count=$(CONFIG_UBOOT_PAD_TO) \ + of=$(obj)u-boot-pad.img 2>/dev/null + dd if=$(obj)u-boot.img of=$(obj)u-boot-pad.img \ + conv=notrunc 2>/dev/null + cat $(obj)u-boot-pad.img $(obj)spl/u-boot-spl.bin > $@ + ifeq ($(CONFIG_SANDBOX),y) GEN_UBOOT = \ cd $(LNDIR) && $(CC) $(SYMS) -T $(obj)u-boot.lds \ |