LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2015-07-31 09:31:34 -06:00
parent da4b159bf0
commit 53292ad956
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pci/pci_auto.c
View File

@ -82,9 +82,9 @@ void pciauto_setup_device(struct pci_controller *hose,
pci_size_t bar_size; pci_size_t bar_size;
u16 cmdstat = 0; u16 cmdstat = 0;
int bar, bar_nr = 0; int bar, bar_nr = 0;
#ifndef CONFIG_PCI_ENUM_ONLY
u8 header_type; u8 header_type;
int rom_addr; int rom_addr;
#ifndef CONFIG_PCI_ENUM_ONLY
pci_addr_t bar_value; pci_addr_t bar_value;
struct pci_region *bar_res; struct pci_region *bar_res;
int found_mem64 = 0; int found_mem64 = 0;
@ -181,6 +181,7 @@ void pciauto_setup_device(struct pci_controller *hose,
bar_nr++; bar_nr++;
} }
#ifndef CONFIG_PCI_ENUM_ONLY
/* Configure the expansion ROM address */ /* Configure the expansion ROM address */
pci_hose_read_config_byte(hose, dev, PCI_HEADER_TYPE, &header_type); pci_hose_read_config_byte(hose, dev, PCI_HEADER_TYPE, &header_type);
if (header_type != PCI_HEADER_TYPE_CARDBUS) { if (header_type != PCI_HEADER_TYPE_CARDBUS) {
@ -201,6 +202,7 @@ void pciauto_setup_device(struct pci_controller *hose,
debug("\n"); debug("\n");
} }
} }
#endif
pci_hose_write_config_word(hose, dev, PCI_COMMAND, cmdstat); pci_hose_write_config_word(hose, dev, PCI_COMMAND, cmdstat);
pci_hose_write_config_byte(hose, dev, PCI_CACHE_LINE_SIZE, pci_hose_write_config_byte(hose, dev, PCI_CACHE_LINE_SIZE,