From 7f8b8c5abc28704e794c4bf05903afc88c808581 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 2 Nov 2024 13:36:54 -0600 Subject: [PATCH] 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 Tested-by: Tom Rini # rpi_3, rpi_4, rpi_arm64, am64x_evm_a53, am64-sk --- 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 48d8bc91ae..4366e495a1 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 d8eded20d4..63487e8d29 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 -- 2.39.5