From: Hou Zhiqiang Date: Tue, 20 Aug 2019 09:35:23 +0000 (+0000) Subject: powerpc: mpc85xx: Add device tree support option for PBL boot image X-Git-Tag: v2019.10-rc4~32^2~13 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bcda5b0df329568ca35dfbdb536605729df4cc67;p=oweals%2Fu-boot.git powerpc: mpc85xx: Add device tree support option for PBL boot image The current Makefile always use u-boot.bin to generate PBL boot image (u-boot.pbl), this patch changes it to use u-boot-with-dtb.bin to support device tree when CONFIG_OF_SEPARATE is enabled. Signed-off-by: Hou Zhiqiang Reviewed-by: Prabhakar Kushwaha --- diff --git a/Makefile b/Makefile index 3b0864ae8e..adb2b9a3f9 100644 --- a/Makefile +++ b/Makefile @@ -1256,8 +1256,14 @@ 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 dts/dt.dtb,u-boot.bin) FORCE + $(if $(CONFIG_SPL_LOAD_FIT),u-boot-nodtb.bin dts/dt.dtb,$(UBOOT_BIN)) FORCE $(call if_changed,mkimage) $(BOARD_SIZE_CHECK)