summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 10 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 025691b..ddc8624 100644
--- a/Makefile
+++ b/Makefile
@@ -762,6 +762,8 @@ endif
# Always append ALL so that arch config.mk's can add custom ones
ALL-y += u-boot.srec u-boot.bin u-boot.sym System.map binary_size_check
+ALL-$(CONFIG_PBL_IMAGE) += u-boot-pbl.bin
+
ALL-$(CONFIG_ONENAND_U_BOOT) += u-boot-onenand.bin
ifeq ($(CONFIG_SPL_FSL_PBL),y)
ALL-$(CONFIG_RAMBOOT_PBL) += u-boot-with-spl-pbl.bin
@@ -1198,6 +1200,14 @@ OBJCOPYFLAGS_u-boot-with-spl-pbl.bin = -I binary -O binary --pad-to=$(CONFIG_SPL
u-boot-with-spl-pbl.bin: spl/u-boot-spl.pbl $(SPL_PAYLOAD) FORCE
$(call if_changed,pad_cat)
+
+
+#Concatenate PBL and U-boot binaries automatically
+OBJCOPYFLAGS_u-boot-pbl.bin := -I binary -O binary --pad-to=$(CONFIG_U_BOOT_PAD_TO) \
+ --gap-fill=0xff
+
+u-boot-pbl.bin: $(srctree)/$(CONFIG_PBL_BINARY:"%"=%) u-boot.bin FORCE
+ $(call if_changed,pad_cat)
# 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