X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cmd%2Fpci.c;h=0043471fc73e59cfb42e828936accaaa5c294f17;hb=0c14bb5ad3311de2c26e66e88f8a6886773b8e0a;hp=fe27b4f761ad9310a00ceeb837a5b3f352a59fb6;hpb=821560fd8e43eecc208c1c52ad24faadb6b52703;p=oweals%2Fu-boot.git diff --git a/cmd/pci.c b/cmd/pci.c index fe27b4f761..0043471fc7 100644 --- a/cmd/pci.c +++ b/cmd/pci.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH * Andreas Heppel @@ -5,8 +6,6 @@ * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Grandegger, DENX Software Engineering, wg@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* @@ -149,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", @@ -630,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); @@ -694,7 +693,7 @@ static int do_pci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if ((bdf = get_pci_dev(argv[2])) == -1) return 1; break; -#if defined(CONFIG_CMD_PCI_ENUM) || defined(CONFIG_DM_PCI) +#if defined(CONFIG_DM_PCI) case 'e': pci_init(); return 0; @@ -782,7 +781,7 @@ static int do_pci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static char pci_help_text[] = "[bus] [long]\n" " - short or long list of PCI devices on bus 'bus'\n" -#if defined(CONFIG_CMD_PCI_ENUM) || defined(CONFIG_DM_PCI) +#if defined(CONFIG_DM_PCI) "pci enum\n" " - Enumerate PCI buses\n" #endif