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

Merge branch 'master' of git://git.denx.de/u-boot-x86

Browse Source
This commit is contained in:
Tom Rini
2016-07-12 08:15:17 -04:00
parent bff97dde8c 9532fe3b40
commit b8e599746c
35 changed files with 773 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/pci/pci_rom.c
View File

@@ -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);