[v6,03/11] test: Tidy up test building with SPL

Message ID	20210919174815.v6.3.I3baa60e56b7d9c5331d2401d15c780ed32478420@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> Subject: [PATCH v6 03/11] test: Tidy up test building with SPL Date: Sun, 19 Sep 2021 17:48:12 -0600 Message-Id: <20210919174815.v6.3.I3baa60e56b7d9c5331d2401d15c780ed32478420@changeid> In-Reply-To: <20210919234820.3840570-1-sjg@chromium.org> References: <20210919234820.3840570-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 [v6,00/11] vpl: Introduce a verifying program loader [v6,01/11] doc: Convert SPL documentation to ReST [v6,02/11] doc: Expand SPL docs to explain the phase and config [v6,03/11] test: Tidy up test building with SPL [v6,04/11] bloblist: Correct Kconfig dependencies [v6,05/11] avb: Don't build in SPL [v6,06/11] Makefile: Simplify devicetree rules for SPL/TPL [v6,07/11] Makefile: Tidy up the TPL build rules [v6,08/11] binman: Add VPL support [v6,09/11] Introduce Verifying Program Loader (VPL) [v6,10/11] vpl: Add Kconfig options for VPL [v6,11/11] sandbox: Add a build for VPL

Message ID

20210919174815.v6.3.I3baa60e56b7d9c5331d2401d15c780ed32478420@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>
Subject: [PATCH v6 03/11] test: Tidy up test building with SPL
Date: Sun, 19 Sep 2021 17:48:12 -0600
Message-Id: 
 <20210919174815.v6.3.I3baa60e56b7d9c5331d2401d15c780ed32478420@changeid>
In-Reply-To: <20210919234820.3840570-1-sjg@chromium.org>
References: <20210919234820.3840570-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 Sept. 19, 2021, 11:48 p.m. UTC

We can in principle add tests to any SPL build, e.g. TPL or VPL. Update
the build rules to handle this.

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

(no changes since v1)

 Makefile             | 2 +-
 scripts/Makefile.spl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 3014788e14e..6837487911a 100644
--- a/Makefile
+++ b/Makefile
@@ -847,7 +847,7 @@  libs-y += drivers/usb/ulpi/
 ifdef CONFIG_POST
 libs-y += post/
 endif
-libs-$(CONFIG_UNIT_TEST) += test/
+libs-$(CONFIG_$(SPL_TPL_)UNIT_TEST) += test/
 libs-$(CONFIG_UT_ENV) += test/env/
 libs-$(CONFIG_UT_OPTEE) += test/optee/
 libs-$(CONFIG_UT_OVERLAY) += test/overlay/
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index 25a3e7fa52e..44d3daaee64 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -109,7 +109,7 @@  libs-y += dts/
 libs-y += fs/
 libs-$(CONFIG_SPL_POST_MEM_SUPPORT) += post/drivers/
 libs-$(CONFIG_SPL_NET_SUPPORT) += net/
-libs-$(CONFIG_SPL_UNIT_TEST) += test/
+libs-$(CONFIG_$(SPL_TPL_)UNIT_TEST) += test/
 
 head-y		:= $(addprefix $(obj)/,$(head-y))
 libs-y		:= $(addprefix $(obj)/,$(libs-y))

[v6,03/11] test: Tidy up test building with SPL

Commit Message

Patch