diff options
| -rw-r--r-- | Makefile | 21 |
1 files changed, 14 insertions, 7 deletions
@@ -1016,8 +1016,20 @@ u-boot.dis: u-boot ifdef CONFIG_TPL SPL_PAYLOAD := tpl/u-boot-with-tpl.bin else +ifeq ($(ARCH),powerpc) +ifdef CONFIG_OF_CONTROL +SPL_PAYLOAD := u-boot-dtb.bin +else SPL_PAYLOAD := u-boot.bin -endif +endif #ifdef CONFIG_OF_CONTROL +else +ifdef CONFIG_OF_CONTROL +SPL_PAYLOAD := u-boot-dtb.img +else +SPL_PAYLOAD := u-boot.img +endif #ifdef CONFIG_OF_CONTROL +endif #ifdef powerpc +endif #ifdef CONFIG_TPL OBJCOPYFLAGS_u-boot-with-spl.bin = -I binary -O binary \ --pad-to=$(CONFIG_SPL_PAD_TO) @@ -1180,16 +1192,11 @@ 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 $(UBOOT_BINLOAD) FORCE +u-boot-with-spl-pbl.bin: spl/u-boot-spl.pbl $(SPL_PAYLOAD) FORCE $(call if_changed,pad_cat) # PPC4xx needs the SPL at the end of the image, since the reset vector |