diff options
author | Stefan Roese | 2013-02-22 04:36:50 -0600 |
---|---|---|
committer | Stefan Roese | 2013-04-22 02:53:53 -0500 |
commit | ecddccd006e0d5ee2d0336175d787839460dc66b (patch) | |
tree | f744a2bc15f544347a68c1815485cae7fcbe623d /Makefile | |
parent | 98f99e9f16462fa07ad0b0cd0c7c0d2623a6da87 (diff) | |
download | u-boot-ecddccd006e0d5ee2d0336175d787839460dc66b.tar.gz u-boot-ecddccd006e0d5ee2d0336175d787839460dc66b.tar.xz u-boot-ecddccd006e0d5ee2d0336175d787839460dc66b.zip |
Makefile: Add target for combined u-boot.img & spl/u-boot.bin
This new make target "u-boot-img-spl-at-end.bin" consists of the
the real, full-blown U-Boot image and the U-Boot SPL binary
directly attached to it. The full-blown U-Boot image has the
mkimage header included, with its load-address and entry-point.
This will be used by the upcoming lwmon5 PPC440EPx derivate board
port.
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -554,6 +554,18 @@ endif | |||
554 | $(obj)u-boot-img.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.img | 554 | $(obj)u-boot-img.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.img |
555 | cat $(obj)spl/u-boot-spl.bin $(obj)u-boot.img > $@ | 555 | cat $(obj)spl/u-boot-spl.bin $(obj)u-boot.img > $@ |
556 | 556 | ||
557 | # PPC4xx needs the SPL at the end of the image, since the reset vector | ||
558 | # is located at 0xfffffffc. So we can't use the "u-boot-img.bin" target | ||
559 | # and need to introduce a new build target with the full blown U-Boot | ||
560 | # at the start padded up to the start of the SPL image. And then concat | ||
561 | # the SPL image to the end. | ||
562 | $(obj)u-boot-img-spl-at-end.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.img | ||
563 | tr "\000" "\377" < /dev/zero | dd ibs=1 count=$(CONFIG_UBOOT_PAD_TO) \ | ||
564 | of=$(obj)u-boot-pad.img 2>/dev/null | ||
565 | dd if=$(obj)u-boot.img of=$(obj)u-boot-pad.img \ | ||
566 | conv=notrunc 2>/dev/null | ||
567 | cat $(obj)u-boot-pad.img $(obj)spl/u-boot-spl.bin > $@ | ||
568 | |||
557 | ifeq ($(CONFIG_SANDBOX),y) | 569 | ifeq ($(CONFIG_SANDBOX),y) |
558 | GEN_UBOOT = \ | 570 | GEN_UBOOT = \ |
559 | cd $(LNDIR) && $(CC) $(SYMS) -T $(obj)u-boot.lds \ | 571 | cd $(LNDIR) && $(CC) $(SYMS) -T $(obj)u-boot.lds \ |