[v4,07/12] Makefile: Simplify devicetree rules for SPL/TPL

Message ID	20210801132108.v4.7.I8c94b9d5c8a84fab4cae62bea49eb6bdce33c337@changeid
State	Superseded
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>, Masahiro Yamada <yamada.masahiro@socionext.com> Subject: [PATCH v4 07/12] Makefile: Simplify devicetree rules for SPL/TPL Date: Sun, 1 Aug 2021 13:21:10 -0600 Message-Id: <20210801132108.v4.7.I8c94b9d5c8a84fab4cae62bea49eb6bdce33c337@changeid> In-Reply-To: <20210801192115.2183311-1-sjg@chromium.org> References: <20210801192115.2183311-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	vpl: Introduce a verifying program loader \| expand [v4,00/12] vpl: Introduce a verifying program loader [v4,01/12] doc: Convert SPL documentation to ReST [v4,02/12] doc: Expand SPL docs to explain the phase and config [v4,03/12] test: Tidy up test building with SPL [v4,04/12] spl: Move TPL_HASH_SUPPORT down next to other TPL options [v4,05/12] bloblist: Correct Kconfig dependencies [v4,06/12] avb: Don't build in SPL [v4,07/12] Makefile: Simplify devicetree rules for SPL/TPL [v4,08/12] Makefile: Tidy up the TPL build rules [v4,09/12] binman: Add VPL support [v4,10/12] Introduce Verifying Program Loader (VPL) [v4,11/12] vpl: Add Kconfig options for VPL [v4,12/12] sandbox: Add a build for VPL

Message ID

20210801132108.v4.7.I8c94b9d5c8a84fab4cae62bea49eb6bdce33c337@changeid

State

Superseded

Delegated to:

Tom Rini

Headers

From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>,
 Masahiro Yamada <yamada.masahiro@socionext.com>
Subject: [PATCH v4 07/12] Makefile: Simplify devicetree rules for SPL/TPL
Date: Sun,  1 Aug 2021 13:21:10 -0600
Message-Id: 
 <20210801132108.v4.7.I8c94b9d5c8a84fab4cae62bea49eb6bdce33c337@changeid>
In-Reply-To: <20210801192115.2183311-1-sjg@chromium.org>
References: <20210801192115.2183311-1-sjg@chromium.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

vpl: Introduce a verifying program loader | expand

Commit Message

Simon Glass Aug. 1, 2021, 7:21 p.m. UTC

The current logic checks several options to decide whether SPL/TPL need
the U-Boot devicetree to be built. In fact we can check OF_CONTROL, which
is enabled in all cases that matter.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

(no changes since v1)

 Makefile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 1e8c0a26875..b2e23cc479d 100644
--- a/Makefile
+++ b/Makefile
@@ -1992,9 +1992,7 @@  spl/u-boot-spl-dtb.bin: spl/u-boot-spl
 spl/u-boot-spl-dtb.hex: spl/u-boot-spl
 	@:
 
-spl/u-boot-spl: tools prepare \
-		$(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_SPL_OF_PLATDATA),dts/dt.dtb) \
-		$(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_TPL_OF_PLATDATA),dts/dt.dtb)
+spl/u-boot-spl: tools prepare $(if $(CONFIG_SPL_OF_CONTROL),dts/dt.dtb)
 	$(Q)$(MAKE) obj=spl -f $(srctree)/scripts/Makefile.spl all
 
 spl/sunxi-spl.bin: spl/u-boot-spl
@@ -2009,8 +2007,7 @@  spl/u-boot-spl.sfp: spl/u-boot-spl
 spl/boot.bin: spl/u-boot-spl
 	@:
 
-tpl/u-boot-tpl.bin: tools prepare \
-		$(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_SPL_OF_PLATDATA),dts/dt.dtb)
+tpl/u-boot-tpl.bin: tools prepare $(if $(CONFIG_TPL_OF_CONTROL),dts/dt.dtb)
 	$(Q)$(MAKE) obj=tpl -f $(srctree)/scripts/Makefile.spl all
 	$(TPL_SIZE_CHECK)

[v4,07/12] Makefile: Simplify devicetree rules for SPL/TPL

Commit Message

Patch