From: Tom Rini <trini@konsulko.com>
Date: Tue, 27 Aug 2019 11:11:37 +0000 (-0400)
Subject: Merge https://gitlab.denx.de/u-boot/custodians/u-boot-mpc85xx
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=e4b8dd9b34021241cd05d5cc9d24b4ae34657830;p=u-boot.git

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.
---

e4b8dd9b34021241cd05d5cc9d24b4ae34657830
diff --cc Makefile
index c1e39a0c14,adb2b9a3f9..76f9a7275b
--- a/Makefile
+++ b/Makefile
@@@ -1256,10 -1256,14 +1256,16 @@@ MKIMAGEFLAGS_u-boot-spl.kwb = -n $(srct
  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 dts/dt.dtb,$(UBOOT_BIN)) FORCE
 +		$(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)