From: Simon Glass Date: Fri, 31 Jul 2015 15:31:34 +0000 (-0600) Subject: pci: Fix up code for CONFIG_PCI_ENUM_ONLY X-Git-Tag: v2015.10-rc2~410^2~42 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=53292ad956329eb18de0604f369cd99dd2a2579f;p=oweals%2Fu-boot.git pci: Fix up code for CONFIG_PCI_ENUM_ONLY This option is not used by any board but appears to still be useful, at least for testing. With recent commits it does not build, so fix it. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c index 7ff282b48c..51d2ac0052 100644 --- a/drivers/pci/pci_auto.c +++ b/drivers/pci/pci_auto.c @@ -82,9 +82,9 @@ void pciauto_setup_device(struct pci_controller *hose, pci_size_t bar_size; u16 cmdstat = 0; int bar, bar_nr = 0; +#ifndef CONFIG_PCI_ENUM_ONLY u8 header_type; int rom_addr; -#ifndef CONFIG_PCI_ENUM_ONLY pci_addr_t bar_value; struct pci_region *bar_res; int found_mem64 = 0; @@ -181,6 +181,7 @@ void pciauto_setup_device(struct pci_controller *hose, bar_nr++; } +#ifndef CONFIG_PCI_ENUM_ONLY /* Configure the expansion ROM address */ pci_hose_read_config_byte(hose, dev, PCI_HEADER_TYPE, &header_type); if (header_type != PCI_HEADER_TYPE_CARDBUS) { @@ -201,6 +202,7 @@ void pciauto_setup_device(struct pci_controller *hose, debug("\n"); } } +#endif pci_hose_write_config_word(hose, dev, PCI_COMMAND, cmdstat); pci_hose_write_config_byte(hose, dev, PCI_CACHE_LINE_SIZE,