cmd: Move the "dm" command from test/dm/ to cmd/

The "dm" command under CONFIG_CMD_DM should live under cmd/ rather than
test/dm/ so move it.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/cmd/Makefile b/cmd/Makefile
index 49986437ba5803a819a1d7f2415f7d30c36337e2..15ae4d250f50a06a9b61d44dcee958475bd91160 100644 (file)
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -40,6 +40,7 @@ obj-$(CONFIG_CMD_CPU) += cpu.o
 obj-$(CONFIG_DATAFLASH_MMC_SELECT) += dataflash_mmc_mux.o
 obj-$(CONFIG_CMD_DATE) += date.o
 obj-$(CONFIG_CMD_DEMO) += demo.o
+obj-$(CONFIG_CMD_DM) += dm.o
 obj-$(CONFIG_CMD_SOUND) += sound.o
 ifdef CONFIG_POST
 obj-$(CONFIG_CMD_DIAG) += diag.o

diff --git a/cmd/dm.c b/cmd/dm.c
new file mode 100644 (file)
index 0000000..7b271db
--- /dev/null
+++ b/cmd/dm.c
@@ -0,0 +1,88 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (c) 2013 Google, Inc
+ *
+ * (C) Copyright 2012
+ * Marek Vasut <marex@denx.de>
+ */
+
+#include <common.h>
+#include <command.h>
+#include <dm.h>
+#include <malloc.h>
+#include <mapmem.h>
+#include <errno.h>
+#include <asm/io.h>
+#include <dm/root.h>
+#include <dm/util.h>
+
+static int do_dm_dump_all(cmd_tbl_t *cmdtp, int flag, int argc,
+                         char * const argv[])
+{
+       dm_dump_all();
+
+       return 0;
+}
+
+static int do_dm_dump_uclass(cmd_tbl_t *cmdtp, int flag, int argc,
+                            char * const argv[])
+{
+       dm_dump_uclass();
+
+       return 0;
+}
+
+static int do_dm_dump_devres(cmd_tbl_t *cmdtp, int flag, int argc,
+                            char * const argv[])
+{
+       dm_dump_devres();
+
+       return 0;
+}
+
+static cmd_tbl_t test_commands[] = {
+       U_BOOT_CMD_MKENT(tree, 0, 1, do_dm_dump_all, "", ""),
+       U_BOOT_CMD_MKENT(uclass, 1, 1, do_dm_dump_uclass, "", ""),
+       U_BOOT_CMD_MKENT(devres, 1, 1, do_dm_dump_devres, "", ""),
+};
+
+static __maybe_unused void dm_reloc(void)
+{
+       static int relocated;
+
+       if (!relocated) {
+               fixup_cmdtable(test_commands, ARRAY_SIZE(test_commands));
+               relocated = 1;
+       }
+}
+
+static int do_dm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       cmd_tbl_t *test_cmd;
+       int ret;
+
+#ifdef CONFIG_NEEDS_MANUAL_RELOC
+       dm_reloc();
+#endif
+
+       if (argc < 2)
+               return CMD_RET_USAGE;
+       test_cmd = find_cmd_tbl(argv[1], test_commands,
+                               ARRAY_SIZE(test_commands));
+       argc -= 2;
+       argv += 2;
+       if (!test_cmd || argc > test_cmd->maxargs)
+               return CMD_RET_USAGE;
+
+       ret = test_cmd->cmd(test_cmd, flag, argc, argv);
+
+       return cmd_process_error(test_cmd, ret);
+}
+
+U_BOOT_CMD(
+       dm,     3,      1,      do_dm,
+       "Driver model low level access",
+       "tree          Dump driver model tree ('*' = activated)\n"
+       "dm uclass        Dump list of instances for each uclass\n"
+       "dm devres        Dump list of device resources for each device"
+);

diff --git a/test/dm/Makefile b/test/dm/Makefile
index 6b451060d8aebcacea8474b93b4c18e943e5da44..7dc80be25e366c820d9866e88ad5f5ec4f5cd940 100644 (file)
--- a/test/dm/Makefile
+++ b/test/dm/Makefile
@@ -2,7 +2,6 @@
 #
 # Copyright (c) 2013 Google, Inc
 
-obj-$(CONFIG_CMD_DM) += cmd_dm.o
 obj-$(CONFIG_UT_DM) += bus.o
 obj-$(CONFIG_UT_DM) += test-driver.o
 obj-$(CONFIG_UT_DM) += test-fdt.o

diff --git a/test/dm/cmd_dm.c b/test/dm/cmd_dm.c
deleted file mode 100644 (file)
index 7b271db..0000000
--- a/test/dm/cmd_dm.c
+++ /dev/null
@@ -1,88 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (c) 2013 Google, Inc
- *
- * (C) Copyright 2012
- * Marek Vasut <marex@denx.de>
- */
-
-#include <common.h>
-#include <command.h>
-#include <dm.h>
-#include <malloc.h>
-#include <mapmem.h>
-#include <errno.h>
-#include <asm/io.h>
-#include <dm/root.h>
-#include <dm/util.h>
-
-static int do_dm_dump_all(cmd_tbl_t *cmdtp, int flag, int argc,
-                         char * const argv[])
-{
-       dm_dump_all();
-
-       return 0;
-}
-
-static int do_dm_dump_uclass(cmd_tbl_t *cmdtp, int flag, int argc,
-                            char * const argv[])
-{
-       dm_dump_uclass();
-
-       return 0;
-}
-
-static int do_dm_dump_devres(cmd_tbl_t *cmdtp, int flag, int argc,
-                            char * const argv[])
-{
-       dm_dump_devres();
-
-       return 0;
-}
-
-static cmd_tbl_t test_commands[] = {
-       U_BOOT_CMD_MKENT(tree, 0, 1, do_dm_dump_all, "", ""),
-       U_BOOT_CMD_MKENT(uclass, 1, 1, do_dm_dump_uclass, "", ""),
-       U_BOOT_CMD_MKENT(devres, 1, 1, do_dm_dump_devres, "", ""),
-};
-
-static __maybe_unused void dm_reloc(void)
-{
-       static int relocated;
-
-       if (!relocated) {
-               fixup_cmdtable(test_commands, ARRAY_SIZE(test_commands));
-               relocated = 1;
-       }
-}
-
-static int do_dm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-       cmd_tbl_t *test_cmd;
-       int ret;
-
-#ifdef CONFIG_NEEDS_MANUAL_RELOC
-       dm_reloc();
-#endif
-
-       if (argc < 2)
-               return CMD_RET_USAGE;
-       test_cmd = find_cmd_tbl(argv[1], test_commands,
-                               ARRAY_SIZE(test_commands));
-       argc -= 2;
-       argv += 2;
-       if (!test_cmd || argc > test_cmd->maxargs)
-               return CMD_RET_USAGE;
-
-       ret = test_cmd->cmd(test_cmd, flag, argc, argv);
-
-       return cmd_process_error(test_cmd, ret);
-}
-
-U_BOOT_CMD(
-       dm,     3,      1,      do_dm,
-       "Driver model low level access",
-       "tree          Dump driver model tree ('*' = activated)\n"
-       "dm uclass        Dump list of instances for each uclass\n"
-       "dm devres        Dump list of device resources for each device"
-);