diff options
| author | Tom Rini <[email protected]> | 2019-08-26 17:45:20 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-08-26 17:45:20 -0400 |
| commit | 12277acda0802e4517ca82842c71aae723f0da16 (patch) | |
| tree | 34a610694fdcee8f19f81337f6658a84210262ee /cmd | |
| parent | 7a4b0bc5fe70225ae3595ba81d1473c06fd6b83b (diff) | |
| parent | 44de15d6867c246e7a09ef061d3de56e1799a606 (diff) | |
Merge branch '2019-08-26-master-imports'
- Assorted minor bugfixes
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/gpio.c | 2 | ||||
| -rw-r--r-- | cmd/pci.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmd/gpio.c b/cmd/gpio.c index 53366f36e76..eff36ab2af3 100644 --- a/cmd/gpio.c +++ b/cmd/gpio.c @@ -91,7 +91,7 @@ static int do_gpio_status(bool all, const char *gpio_name) if (!gpio_name || !bank_name || !strncasecmp(gpio_name, bank_name, banklen)) { - const char *p = NULL; + const char *p; int offset; p = gpio_name + banklen; diff --git a/cmd/pci.c b/cmd/pci.c index 2c5ee2a19d8..0043471fc73 100644 --- a/cmd/pci.c +++ b/cmd/pci.c @@ -148,7 +148,7 @@ int pci_bar_show(struct udevice *dev) if ((!is_64 && size_low) || (is_64 && size)) { size = ~size + 1; - printf(" %d %#016llx %#016llx %d %s %s\n", + printf(" %d %#018llx %#018llx %d %s %s\n", bar_id, (unsigned long long)base, (unsigned long long)size, is_64 ? 64 : 32, is_io ? "I/O" : "MEM", @@ -629,10 +629,10 @@ static void pci_show_regions(struct udevice *bus) return; } - printf("# %-16s %-16s %-16s %s\n", "Bus start", "Phys start", "Size", + printf("# %-18s %-18s %-18s %s\n", "Bus start", "Phys start", "Size", "Flags"); for (i = 0, reg = hose->regions; i < hose->region_count; i++, reg++) { - printf("%d %#016llx %#016llx %#016llx ", i, + printf("%d %#018llx %#018llx %#018llx ", i, (unsigned long long)reg->bus_start, (unsigned long long)reg->phys_start, (unsigned long long)reg->size); |