Merge branch 'master' of git://git.denx.de/u-boot-dm

Tom Rini
2 parents 038380597b 4af5b1445c
Showing 2 changed files Side-by-side Diff
include/dm.h
test/dm/cmd_dm.c
@@ -5,7 +5,7 @@
  */
  
 #ifndef _DM_H_
-#define _DM_H
+#define _DM_H_
  
 #include <dm/device.h>
 #include <dm/platdata.h>
@@ -23,9 +23,9 @@
 	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 @@
 		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");
 	}
...	...	@@ -23,9 +23,9 @@
23	23	char local[16];
24	24	struct udevice pos, n, *prev = NULL;
25	25
26		- printf("%s- %s @ %08lx", buf, in->name, (ulong)map_to_sysmem(in));
27		- if (in->flags & DM_FLAG_ACTIVATED)
28		- puts(" - activated");
	26	+ printf("%s- %c %s @ %08lx", buf,
	27	+ in->flags & DM_FLAG_ACTIVATED ? '*' : ' ',
	28	+ in->name, (ulong)map_to_sysmem(in));
29	29	puts("\n");
30	30
31	31	if (list_empty(&in->child_head))
...	...	@@ -84,8 +84,9 @@
84	84	for (ret = uclass_first_device(id, &dev);
85	85	dev;
86	86	ret = uclass_next_device(&dev)) {
87		- printf(" %s @ %08lx:\n", dev->name,
88		- (ulong)map_to_sysmem(dev));
	87	+ printf(" %c %s @ %08lx:\n",
	88	+ dev->flags & DM_FLAG_ACTIVATED ? '*' : ' ',
	89	+ dev->name, (ulong)map_to_sysmem(dev));
89	90	}
90	91	puts("\n");
91	92	}