From patchwork Tue May 28 11:44:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Schocher X-Patchwork-Id: 1106265 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45CsT32b3Hz9s5c for ; Tue, 28 May 2019 21:44:39 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E1A48C2200E; Tue, 28 May 2019 11:44:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 1BEE2C21C51; Tue, 28 May 2019 11:44:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 92C89C21C51; Tue, 28 May 2019 11:44:33 +0000 (UTC) Received: from pollux.denx.de (p578adb1c.dip0.t-ipconnect.de [87.138.219.28]) by lists.denx.de (Postfix) with ESMTP id 3E935C21C29 for ; Tue, 28 May 2019 11:44:33 +0000 (UTC) Received: by pollux.denx.de (Postfix, from userid 515) id 0200C5D27; Tue, 28 May 2019 13:44:32 +0200 (CEST) From: Heiko Schocher To: U-Boot Mailing List Date: Tue, 28 May 2019 13:44:31 +0200 Message-Id: <20190528114431.1259789-1-hs@denx.de> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Cc: Baruch Siach , Stefan Roese , "NXP i.MX U-Boot Team" , Chris Packham Subject: [U-Boot] [PATCH v2] arm, imx, Makefile: fix u-boot-dtb.imx build in CONFIG_MULTI_DTB_FIT case X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" in case CONFIG_MULTI_DTB_FIT is set and u-boot-dtb.imx image is build, currently u-boot-dtb.bin is used for generating the u-boot-dtb.imx binary, which is wrong, as it contains only a dtb blob not the fit.blob Use instead the u-boot-fit-dtb.bin for generating u-boot-dtb.imx which contains the fit.blob. Signed-off-by: Heiko Schocher --- clean travis build, see: https://travis-ci.org/hsdenx/u-boot-test/builds/537359339 Changes in v2: - reworded commit subject and commit message as Fabio recommended Makefile | 4 ++++ arch/arm/mach-imx/Makefile | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 059978bfe6..8c05e5cff1 100644 --- a/Makefile +++ b/Makefile @@ -1077,6 +1077,10 @@ endif u-boot.bin: u-boot-fit-dtb.bin FORCE $(call if_changed,copy) + +u-boot-dtb.bin: u-boot-nodtb.bin dts/dt.dtb FORCE + $(call if_changed,cat) + else ifeq ($(CONFIG_OF_SEPARATE),y) u-boot-dtb.bin: u-boot-nodtb.bin dts/dt.dtb FORCE $(call if_changed,cat) diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 37675d0558..3a65bd5b28 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -126,7 +126,16 @@ u-boot.imx: u-boot.bin u-boot.cfgout $(PLUGIN).bin FORCE $(call if_changed,mkimage) $(BOARD_SIZE_CHECK) -ifeq ($(CONFIG_OF_SEPARATE),y) +ifeq ($(CONFIG_MULTI_DTB_FIT),y) +MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) \ + -T $(IMAGE_TYPE) -e $(CONFIG_SYS_TEXT_BASE) +u-boot-dtb.imx: MKIMAGEOUTPUT = u-boot-dtb.imx.log + +u-boot-dtb.imx: u-boot-fit-dtb.bin u-boot-dtb.cfgout $(PLUGIN).bin FORCE +ifeq ($(DEPFILE_EXISTS),0) + $(call if_changed,mkimage) +endif +else ifeq ($(CONFIG_OF_SEPARATE),y) MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) \ -T $(IMAGE_TYPE) -e $(CONFIG_SYS_TEXT_BASE) u-boot-dtb.imx: MKIMAGEOUTPUT = u-boot-dtb.imx.log