test: Run bootstd tests only on sandbox

These make use of disk images which are not available on reak boards.
Add a new Kconfig to ensure these tests only run where they are valid.

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

diff --git a/test/Kconfig b/test/Kconfig
index 310fb1ba6eaa678fb54220b38f91676af36af82f..e842c01308f99da48826a69347b8380fa1941994 100644 (file)
--- a/test/Kconfig
+++ b/test/Kconfig
@@ -65,6 +65,11 @@ config UT_LIB_RSA
 
 endif
 
+config UT_BOOTSTD
+       bool "Unit tests for standard boot"
+       depends on UNIT_TEST && SANDBOX
+       default y
+
 config UT_COMPRESSION
        bool "Unit test for compression"
        depends on UNIT_TEST

diff --git a/test/Makefile b/test/Makefile
index 8e1fed2c28b27683a74184bcdf09a076eedf45da..6b8a1506f54771bb47ed9b4ec96141fcbc8533e2 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -23,7 +23,7 @@ obj-$(CONFIG_UT_TIME) += time_ut.o
 obj-y += ut.o
 
 ifeq ($(CONFIG_SPL_BUILD),)
-obj-$(CONFIG_UNIT_TEST) += boot/
+obj-$(CONFIG_$(SPL_)UT_BOOTSTD) += boot/
 obj-$(CONFIG_UNIT_TEST) += common/
 obj-y += log/
 obj-$(CONFIG_$(SPL_)UT_UNICODE) += unicode_ut.o

diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index 60cd049eb9b8a39aeda302cb5bb464123fd6d72c..1b934b23295954b8cb7215839c69bec490f5c541 100644 (file)
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -57,7 +57,7 @@ static struct cmd_tbl cmd_ut_sub[] = {
 #ifdef CONFIG_CMD_BDI
        U_BOOT_CMD_MKENT(bdinfo, CONFIG_SYS_MAXARGS, 1, do_ut_bdinfo, "", ""),
 #endif
-#ifdef CONFIG_BOOTSTD
+#ifdef CONFIG_UT_BOOTSTD
        U_BOOT_CMD_MKENT(bootstd, CONFIG_SYS_MAXARGS, 1, do_ut_bootstd,
                         "", ""),
 #endif