summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2022-10-12 15:12:42 -0400
committerTom Rini <[email protected]>2022-10-12 15:12:42 -0400
commit0e49f5c26caf9972137a474065afd4bdfe5ec062 (patch)
treea1f2f84786fed424a19483f3f996e4454963cfd3 /test
parent8db1fa5a0da78c1a9a16882f2e49beac3ccf5308 (diff)
parentedb47d612fe9ddca77cd583f14c71517f065405f (diff)
Merge branch '2022-10-12-additional-fixes'
- Add "ubi list", Nokia RX51 fixes, other assorted fixes
Diffstat (limited to 'test')
-rw-r--r--test/cmd/Makefile2
-rw-r--r--test/cmd_ut.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/test/cmd/Makefile b/test/cmd/Makefile
index b7b9bd43f6b..f2a5f4ed808 100644
--- a/test/cmd/Makefile
+++ b/test/cmd/Makefile
@@ -15,5 +15,7 @@ obj-$(CONFIG_CMD_LOADM) += loadm.o
obj-$(CONFIG_CMD_MEM_SEARCH) += mem_search.o
obj-$(CONFIG_CMD_PINMUX) += pinmux.o
obj-$(CONFIG_CMD_PWM) += pwm.o
+ifdef CONFIG_SANDBOX
obj-$(CONFIG_CMD_SETEXPR) += setexpr.o
+endif
obj-$(CONFIG_CMD_TEMPERATURE) += temperature.o
diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index 11c219b48ac..99e53dddc15 100644
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -62,7 +62,7 @@ static struct cmd_tbl cmd_ut_sub[] = {
U_BOOT_CMD_MKENT(log, CONFIG_SYS_MAXARGS, 1, do_ut_log, "", ""),
#endif
U_BOOT_CMD_MKENT(mem, CONFIG_SYS_MAXARGS, 1, do_ut_mem, "", ""),
-#ifdef CONFIG_CMD_SETEXPR
+#if defined(CONFIG_SANDBOX) && defined(CONFIG_CMD_SETEXPR)
U_BOOT_CMD_MKENT(setexpr, CONFIG_SYS_MAXARGS, 1, do_ut_setexpr, "",
""),
#endif