Merge tag 'efi-2022-07-rc4-4' of https://source.denx.de/u-boot/custodians/u-boot-efi

[platform/kernel/u-boot.git] / cmd / dm.c

diff --git a/cmd/dm.c b/cmd/dm.c
index 108707c..1dd19fe 100644 (file)
--- a/cmd/dm.c
+++ b/cmd/dm.c
@@ -16,43 +16,61 @@
 #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[])
+static int do_dm_dump_all(struct cmd_tbl *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[])
+static int do_dm_dump_uclass(struct cmd_tbl *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[])
+static int do_dm_dump_devres(struct cmd_tbl *cmdtp, int flag, int argc,
+                            char *const argv[])
 {
        dm_dump_devres();
 
        return 0;
 }
 
-static int do_dm_dump_drivers(cmd_tbl_t *cmdtp, int flag, int argc,
-                              char * const argv[])
+static int do_dm_dump_drivers(struct cmd_tbl *cmdtp, int flag, int argc,
+                             char *const argv[])
 {
        dm_dump_drivers();
 
        return 0;
 }
 
-static cmd_tbl_t test_commands[] = {
+static int do_dm_dump_driver_compat(struct cmd_tbl *cmdtp, int flag, int argc,
+                                   char * const argv[])
+{
+       dm_dump_driver_compat();
+
+       return 0;
+}
+
+static int do_dm_dump_static_driver_info(struct cmd_tbl *cmdtp, int flag, int argc,
+                                        char * const argv[])
+{
+       dm_dump_static_driver_info();
+
+       return 0;
+}
+
+static struct cmd_tbl 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, "", ""),
        U_BOOT_CMD_MKENT(drivers, 1, 1, do_dm_dump_drivers, "", ""),
+       U_BOOT_CMD_MKENT(compat, 1, 1, do_dm_dump_driver_compat, "", ""),
+       U_BOOT_CMD_MKENT(static, 1, 1, do_dm_dump_static_driver_info, "", ""),
 };
 
 static __maybe_unused void dm_reloc(void)
@@ -65,9 +83,9 @@ static __maybe_unused void dm_reloc(void)
        }
 }
 
-static int do_dm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_dm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
-       cmd_tbl_t *test_cmd;
+       struct cmd_tbl *test_cmd;
        int ret;
 
 #ifdef CONFIG_NEEDS_MANUAL_RELOC
@@ -94,5 +112,7 @@ U_BOOT_CMD(
        "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\n"
-       "dm drivers       Dump list of drivers and their compatible strings\n"
+       "dm drivers       Dump list of drivers with uclass and instances\n"
+       "dm compat        Dump list of drivers with compatibility strings\n"
+       "dm static        Dump list of drivers with static platform data"
 );