diff options
| author | Tom Rini | 2021-01-05 22:34:43 -0500 |
|---|---|---|
| committer | Tom Rini | 2021-01-05 22:34:43 -0500 |
| commit | b11f634b1c1be6ab419758c6596c673445e5ac70 (patch) | |
| tree | 2329e1ff53c6c543e01d84b7901c53621ad8b7f9 /drivers/core/dump.c | |
| parent | 720620e6916ba40b9a173bb07706d2c73f3c23e7 (diff) | |
| parent | 970349a96dac3ad46c33851b1a773bfe3f1d4b33 (diff) | |
Merge tag 'dm-pull-5jan21' of git://git.denx.de/u-boot-dm into next
Driver model: make some udevice fields private
Driver model: Rename U_BOOT_DEVICE et al.
dtoc: Tidy up and add more tests
ns16550 code clean-up
x86 and sandbox minor fixes for of-platdata
dtoc prepration for adding build-time instantiation
Diffstat (limited to 'drivers/core/dump.c')
| -rw-r--r-- | drivers/core/dump.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/core/dump.c b/drivers/core/dump.c index 20125473212..f8afea30a93 100644 --- a/drivers/core/dump.c +++ b/drivers/core/dump.c @@ -14,11 +14,13 @@ static void show_devices(struct udevice *dev, int depth, int last_flag) { int i, is_last; struct udevice *child; + u32 flags = dev_get_flags(dev); /* print the first 20 characters to not break the tree-format. */ - printf(" %-10.10s %3d [ %c ] %-20.20s ", dev->uclass->uc_drv->name, + printf(IS_ENABLED(CONFIG_SPL_BUILD) ? " %s %d [ %c ] %s " : + " %-10.10s %3d [ %c ] %-20.20s ", dev->uclass->uc_drv->name, dev_get_uclass_index(dev, NULL), - dev->flags & DM_FLAG_ACTIVATED ? '+' : ' ', dev->driver->name); + flags & DM_FLAG_ACTIVATED ? '+' : ' ', dev->driver->name); for (i = depth; i >= 0; i--) { is_last = (last_flag >> i) & 1; @@ -65,9 +67,9 @@ void dm_dump_all(void) static void dm_display_line(struct udevice *dev, int index) { printf("%-3i %c %s @ %08lx", index, - dev->flags & DM_FLAG_ACTIVATED ? '*' : ' ', + dev_get_flags(dev) & DM_FLAG_ACTIVATED ? '*' : ' ', dev->name, (ulong)map_to_sysmem(dev)); - if (dev->sqq != -1) + if (dev->seq_ != -1) printf(", seq %d", dev_seq(dev)); puts("\n"); } |