diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-12 08:15:17 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-12 08:15:17 -0400 |
| commit | b8e599746cac1833328bc3a8e37eeefe346baf90 (patch) | |
| tree | ec49cc9ac3c8638fe11774e945cf0bcc4e87c1f4 /drivers | |
| parent | bff97dde8c8cf6fd5f04bb26fca83f61eadc1741 (diff) | |
| parent | 9532fe3b40ddf66ef976dee3d5cf1d8b3396bf4d (diff) | |
| download | u-boot-b8e599746cac1833328bc3a8e37eeefe346baf90.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/pci_rom.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c index 9eb605be74..399055b078 100644 --- a/drivers/pci/pci_rom.c +++ b/drivers/pci/pci_rom.c @@ -39,14 +39,9 @@ __weak bool board_should_run_oprom(struct udevice *dev) return true; } -static bool should_load_oprom(struct udevice *dev) +__weak bool board_should_load_oprom(struct udevice *dev) { - if (IS_ENABLED(CONFIG_ALWAYS_LOAD_OPROM)) - return 1; - if (board_should_run_oprom(dev)) - return 1; - - return 0; + return true; } __weak uint32_t board_map_oprom_vendev(uint32_t vendev) @@ -278,7 +273,7 @@ int dm_pci_run_vga_bios(struct udevice *dev, int (*int15_handler)(void), return -ENODEV; } - if (!should_load_oprom(dev)) + if (!board_should_load_oprom(dev)) return -ENXIO; ret = pci_rom_probe(dev, &rom); |