From: Tom Rini <trini@konsulko.com>
Date: Fri, 16 Aug 2024 03:49:04 +0000 (-0600)
Subject: test/boot: Make BOOTSTD tests depend on UT_BOOTSTD
X-Git-Url: http://git.dujemihanovic.xyz/posts?a=commitdiff_plain;h=916a4704fc868ef230ad920851e93161eaf995b4;p=u-boot.git

test/boot: Make BOOTSTD tests depend on UT_BOOTSTD

While we have a symbol for controlling if we will be testing BOOTSTD or
not, and it depends on SANDBOX, we do not control the building of
test/boot/ content correctly. Guard the current bootstd tests with
a check for UT_BOOTSTD and leave the measurement test available.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/test/boot/Makefile b/test/boot/Makefile
index 8ec5daa7bf..d8eded20d4 100644
--- a/test/boot/Makefile
+++ b/test/boot/Makefile
@@ -2,12 +2,15 @@
 #
 # Copyright 2021 Google LLC
 
+ifdef CONFIG_UT_BOOTSTD
 obj-$(CONFIG_BOOTSTD) += bootdev.o bootstd_common.o bootflow.o bootmeth.o
 obj-$(CONFIG_FIT) += image.o
-obj-$(CONFIG_MEASURED_BOOT) += measurement.o
 
 obj-$(CONFIG_EXPO) += expo.o
 obj-$(CONFIG_CEDIT) += cedit.o
+endif
+
+obj-$(CONFIG_MEASURED_BOOT) += measurement.o
 
 ifdef CONFIG_OF_LIVE
 obj-$(CONFIG_BOOTMETH_VBE_SIMPLE) += vbe_simple.o