On 11/2/24 20:36, Simon Glass wrote:
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 <[email protected]>
---
Changes in v2:
- Make the test dependent on sandbox
test/Makefile | 3 ---
test/boot/Makefile | 3 +++
test/{ => boot}/bootm.c | 0
3 files changed, 3 insertions(+), 3 deletions(-)
rename test/{ => boot}/bootm.c (100%)
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),)
Shouldn't this be CONFIG_$(PHASE_)BLOBLIST, see common/Makefile.
Best regards
Heinrich
-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
similarity index 100%
rename from test/bootm.c
rename to test/boot/bootm.c
