Building test/boot fails on qemu-riscv64_smode_defconfig with
test/boot/bootdev.c:178: undefined reference to `usb_started'
Checking CONFIG_UNIT_TEST is already done in /Makefile, no need to repeat it in /test/Makefile.
Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com --- test/Makefile | 4 ++-- test/cmd_ut.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/Makefile b/test/Makefile index 178773647a..2b3de3e54d 100644 --- a/test/Makefile +++ b/test/Makefile @@ -26,8 +26,8 @@ obj-$(CONFIG_UT_TIME) += time_ut.o obj-y += ut.o
ifeq ($(CONFIG_SPL_BUILD),) -obj-$(CONFIG_UNIT_TEST) += boot/ -obj-$(CONFIG_UNIT_TEST) += common/ +obj-$(CONFIG_SANDBOX) += boot/ +obj-y += common/ obj-y += log/ obj-$(CONFIG_$(SPL_)UT_UNICODE) += unicode_ut.o endif diff --git a/test/cmd_ut.c b/test/cmd_ut.c index 3789c6b784..63443cfa6f 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -28,7 +28,7 @@ int cmd_ut_category(const char *name, const char *prefix,
static struct cmd_tbl cmd_ut_sub[] = { U_BOOT_CMD_MKENT(all, CONFIG_SYS_MAXARGS, 1, do_ut_all, "", ""), -#ifdef CONFIG_BOOTSTD +#if defined(CONFIG_BOOTSTD) && defined(CONFIG_SANDBOX) U_BOOT_CMD_MKENT(bootstd, CONFIG_SYS_MAXARGS, 1, do_ut_bootstd, "", ""), #endif