summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2024-11-02 13:36:54 -0600
committerTom Rini <trini@konsulko.com>2024-11-13 11:56:01 -0600
commit7f8b8c5abc28704e794c4bf05903afc88c808581 (patch)
tree3e6afc69db98e7942a70f81edfb36e73219fd581 /test
parentee3c8698e0908d881ce85fd82a26f2ac96978c71 (diff)
bootm: test: Move test into boot
This test doesn't belong at the top level. Move it into the boot/ directory, to match its implementation. This test is currently dependent on bloblist, but the real dependency is on sandbox, so update that. Signed-off-by: Simon Glass <sjg@chromium.org> Tested-by: Tom Rini <trini@konsulko.com> # rpi_3, rpi_4, rpi_arm64, am64x_evm_a53, am64-sk
Diffstat (limited to 'test')
-rw-r--r--test/Makefile3
-rw-r--r--test/boot/Makefile3
-rw-r--r--test/boot/bootm.c (renamed from test/bootm.c)0
3 files changed, 3 insertions, 3 deletions
diff --git a/test/Makefile b/test/Makefile
index 48d8bc91ae6..4366e495a15 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -4,9 +4,6 @@
obj-y += test-main.o
-ifneq ($(CONFIG_$(XPL_)BLOBLIST),)
-obj-$(CONFIG_$(XPL_)CMDLINE) += bootm.o
-endif
obj-$(CONFIG_$(XPL_)CMDLINE) += cmd/
obj-$(CONFIG_$(XPL_)CMDLINE) += cmd_ut.o
obj-y += dm/
diff --git a/test/boot/Makefile b/test/boot/Makefile
index d8eded20d4f..63487e8d29e 100644
--- a/test/boot/Makefile
+++ b/test/boot/Makefile
@@ -10,6 +10,9 @@ obj-$(CONFIG_EXPO) += expo.o
obj-$(CONFIG_CEDIT) += cedit.o
endif
+ifdef CONFIG_SANDBOX
+obj-$(CONFIG_$(XPL_)CMDLINE) += bootm.o
+endif
obj-$(CONFIG_MEASURED_BOOT) += measurement.o
ifdef CONFIG_OF_LIVE
diff --git a/test/bootm.c b/test/boot/bootm.c
index 26c15552bf6..26c15552bf6 100644
--- a/test/bootm.c
+++ b/test/boot/bootm.c