summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2015-07-06 16:31:33 +0800
committerSimon Glass <sjg@chromium.org>2015-07-14 18:03:18 -0600
commit786a08e0dd3d0505e10cc93622ce5db696c627e9 (patch)
tree9b4881656db5e70fbecc8712a8122165d2f06101 /drivers
parentdf07d91956162c55f948cf150c14d678eca3b838 (diff)
downloadu-boot-imx-786a08e0dd3d0505e10cc93622ce5db696c627e9.zip
u-boot-imx-786a08e0dd3d0505e10cc93622ce5db696c627e9.tar.gz
u-boot-imx-786a08e0dd3d0505e10cc93622ce5db696c627e9.tar.bz2
x86: Move VGA option rom macros to Kconfig
Move X86_OPTION_ROM_FILE & X86_OPTION_ROM_ADDR to arch/x86/Kconfig and rename them to VGA_BIOS_FILE & VGA_BIOS_ADDR which depend on HAVE_VGA_BIOS. The new names are consistent with other x86 binary blob options like HAVE_FSP/FSP_FILE/FSP_ADDR. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/pci_rom.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index 0a644a9..dd7fd95 100644
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -79,8 +79,8 @@ static int pci_rom_probe(pci_dev_t dev, uint class,
if (vendev != mapped_vendev)
debug("Device ID mapped to %#08x\n", mapped_vendev);
-#ifdef CONFIG_X86_OPTION_ROM_ADDR
- rom_address = CONFIG_X86_OPTION_ROM_ADDR;
+#ifdef CONFIG_VGA_BIOS_ADDR
+ rom_address = CONFIG_VGA_BIOS_ADDR;
#else
if (pciauto_setup_rom(pci_bus_to_hose(PCI_BUS(dev)), dev)) {