aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-08-27 07:11:37 -0400
committerTom Rini <trini@konsulko.com>2019-08-27 07:11:37 -0400
commite4b8dd9b34021241cd05d5cc9d24b4ae34657830 (patch)
treefee018fa2416fbc453234661d35fa075c06e8ec3 /Makefile
parente7ce2e04831e8801f8a1e3afc6dee66b4132c48b (diff)
parentf83c7788a71eb3a67571f80a7917f2404156df70 (diff)
downloadu-boot-e4b8dd9b34021241cd05d5cc9d24b4ae34657830.zip
u-boot-e4b8dd9b34021241cd05d5cc9d24b4ae34657830.tar.gz
u-boot-e4b8dd9b34021241cd05d5cc9d24b4ae34657830.tar.bz2
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-mpc85xx
Support of device tree model for T2080RDB, T4240RDB, T1024RDB, T1042D4RDB, P1020RDB, P2020RDB, P2041RDB, P3041DS, P4080DS, P5040DS and MPC8548CDS. Also support of i2c dm model.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c1e39a0..76f9a72 100644
--- a/Makefile
+++ b/Makefile
@@ -1256,10 +1256,16 @@ MKIMAGEFLAGS_u-boot-spl.kwb = -n $(srctree)/$(CONFIG_SYS_KWD_CONFIG:"%"=%) \
MKIMAGEFLAGS_u-boot.pbl = -n $(srctree)/$(CONFIG_SYS_FSL_PBL_RCW:"%"=%) \
-R $(srctree)/$(CONFIG_SYS_FSL_PBL_PBI:"%"=%) -T pblimage
+ifeq ($(CONFIG_MPC85xx)$(CONFIG_OF_SEPARATE),yy)
+UBOOT_BIN := u-boot-with-dtb.bin
+else
+UBOOT_BIN := u-boot.bin
+endif
+
u-boot-dtb.img u-boot.img u-boot.kwb u-boot.pbl u-boot-ivt.img: \
$(if $(CONFIG_SPL_LOAD_FIT),u-boot-nodtb.bin \
$(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_OF_HOSTFILE),dts/dt.dtb) \
- ,u-boot.bin) FORCE
+ ,$(UBOOT_BIN)) FORCE
$(call if_changed,mkimage)
$(BOARD_SIZE_CHECK)