diff options
| author | Tom Rini <trini@konsulko.com> | 2019-05-08 09:20:19 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-05-08 09:20:19 -0400 |
| commit | 8c66fb88e3bd00b486d2da2b90f5ff8534b7e3c0 (patch) | |
| tree | 4b8a83298e5db7f930fd76f1cb7c0b40c0fbaf10 /drivers/pci | |
| parent | d4c352138c266d618677778a40a846946ec1af1c (diff) | |
| parent | ffe403762be48d475de4b2b6df87c32fd3a1e8dd (diff) | |
Merge git://git.denx.de/u-boot-x86
- Allow x86 boards to use TPL, SPL and U-Boot proper
- Update sysreset x86 driver to utilize ACPI registers to do power off
- Add a new chromebook_samus_tpl board for TPL support
- Several minor changes in binman tool
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci_rom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c index 7d9b75c2c4..2cede1211b 100644 --- a/drivers/pci/pci_rom.c +++ b/drivers/pci/pci_rom.c @@ -306,7 +306,7 @@ int dm_pci_run_vga_bios(struct udevice *dev, int (*int15_handler)(void), goto err; #endif } else { -#if defined(CONFIG_X86) && CONFIG_IS_ENABLED(X86_32BIT_INIT) +#if defined(CONFIG_X86) && (CONFIG_IS_ENABLED(X86_32BIT_INIT) || CONFIG_TPL) bios_set_interrupt_handler(0x15, int15_handler); bios_run_on_x86(dev, (unsigned long)ram, vesa_mode, |