Merge branch 'sandbox' of git://git.denx.de/u-boot-x86

diff --git a/include/dm.h b/include/dm.h
index 8bbb21b575e56f077abaa28eeff542169c7251e9..a179c8a6e38c7e0900e185b952624d7df6f56bbc 100644 (file)
--- a/include/dm.h
+++ b/include/dm.h
@@ -5,7 +5,7 @@
  */
 
 #ifndef _DM_H_
-#define _DM_H
+#define _DM_H_
 
 #include <dm/device.h>
 #include <dm/platdata.h>

diff --git a/test/dm/cmd_dm.c b/test/dm/cmd_dm.c
index aa8122c00541f41b4e46845977628775bc172ca0..96f10f3b1d45b9b19fb7a296be8394be9b1f78fb 100644 (file)
--- a/test/dm/cmd_dm.c
+++ b/test/dm/cmd_dm.c
@@ -23,9 +23,9 @@ static int display_succ(struct udevice *in, char *buf)
        char local[16];
        struct udevice *pos, *n, *prev = NULL;
 
-       printf("%s- %s @ %08lx", buf, in->name, (ulong)map_to_sysmem(in));
-       if (in->flags & DM_FLAG_ACTIVATED)
-               puts(" - activated");
+       printf("%s- %c %s @ %08lx", buf,
+              in->flags & DM_FLAG_ACTIVATED ? '*' : ' ',
+              in->name, (ulong)map_to_sysmem(in));
        puts("\n");
 
        if (list_empty(&in->child_head))
@@ -84,8 +84,9 @@ static int do_dm_dump_uclass(cmd_tbl_t *cmdtp, int flag, int argc,
                for (ret = uclass_first_device(id, &dev);
                     dev;
                     ret = uclass_next_device(&dev)) {
-                       printf("  %s @ %08lx:\n", dev->name,
-                              (ulong)map_to_sysmem(dev));
+                       printf("  %c %s @ %08lx:\n",
+                              dev->flags & DM_FLAG_ACTIVATED ? '*' : ' ',
+                              dev->name, (ulong)map_to_sysmem(dev));
                }
                puts("\n");
        }