diff options
| author | Tom Rini <trini@ti.com> | 2014-06-24 14:04:33 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-06-24 14:04:33 -0400 |
| commit | 19198f8b013b70ae6f497422e5418cc009dea145 (patch) | |
| tree | d300eca164e202d476f0342f51b9b2a04662094b | |
| parent | 038380597bc9b97378da2e18355cd7346d17b002 (diff) | |
| parent | 4af5b1445c2c17b72f515134d510d37e05a344f1 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-dm
| -rw-r--r-- | include/dm.h | 2 | ||||
| -rw-r--r-- | test/dm/cmd_dm.c | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/include/dm.h b/include/dm.h index 8bbb21b575..a179c8a6e3 100644 --- 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 aa8122c005..96f10f3b1d 100644 --- 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"); } |