test: Drop the function for running bootm tests

Use the new suite-runner to run these tests instead.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/include/test/suites.h b/include/test/suites.h
index 32b7e8e3d5a5fab9fabf3e2208bfeb654d9f5a84..77af692be3c8a2110dccede195e0f5f1738a425c 100644 (file)
--- a/include/test/suites.h
+++ b/include/test/suites.h
@@ -32,7 +32,6 @@ int cmd_ut_category(const char *name, const char *prefix,
 
 int do_ut_addrmap(struct cmd_tbl *cmdtp, int flag, int argc,
                  char *const argv[]);
-int do_ut_bootm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 int do_ut_bootstd(struct cmd_tbl *cmdtp, int flag, int argc,
                  char *const argv[]);
 int do_ut_hush(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);

diff --git a/test/boot/bootm.c b/test/boot/bootm.c
index 6e78c3ef9ac33fbf401526c8f413abfa849bebff..7e0ccb0e23f757a395137f696ab04396209d26e3 100644 (file)
--- a/test/boot/bootm.c
+++ b/test/boot/bootm.c
@@ -249,12 +249,3 @@ static int bootm_test_subst_both(struct unit_test_state *uts)
        return 0;
 }
 BOOTM_TEST(bootm_test_subst_both, 0);
-
-int do_ut_bootm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
-{
-       struct unit_test *tests = UNIT_TEST_SUITE_START(bootm);
-       const int n_ents = UNIT_TEST_SUITE_COUNT(bootm);
-
-       return cmd_ut_category("bootm", "bootm_test_", tests, n_ents,
-                              argc, argv);
-}

diff --git a/test/cmd_ut.c b/test/cmd_ut.c
index 93bcc5efc74205fe48f610512c7293c9980750a3..71283d6dd141c2ac172bb12f33bcaf4074d26a3e 100644 (file)
--- a/test/cmd_ut.c
+++ b/test/cmd_ut.c
@@ -171,7 +171,7 @@ static struct suite suites[] = {
 #ifdef CONFIG_SANDBOX
 #if CONFIG_IS_ENABLED(BLOBLIST)
        SUITE(bloblist),
-       SUITE_CMD(bootm, do_ut_bootm),
+       SUITE(bootm),
 #endif
 #endif
 #ifdef CONFIG_CMD_ADDRMAP