diff options
| author | Simon Glass <sjg@chromium.org> | 2017-01-16 07:04:09 -0700 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2017-02-06 11:38:46 +0800 |
| commit | 05cbd985c0b9b5319355fcd562f5665d5fcb8652 (patch) | |
| tree | 12ea40de97e5e159ec44cc30298d4d781fc4aa64 | |
| parent | 1b4086307e5b5c26ac33ad31bb5da60578e5765d (diff) | |
| download | u-boot-imx-05cbd985c0b9b5319355fcd562f5665d5fcb8652.zip u-boot-imx-05cbd985c0b9b5319355fcd562f5665d5fcb8652.tar.gz u-boot-imx-05cbd985c0b9b5319355fcd562f5665d5fcb8652.tar.bz2 | |
x86: Don't try to run the VGA BIOS in 64-bit mode
This is not supported, so disable it for now.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| -rw-r--r-- | arch/x86/lib/Makefile | 2 | ||||
| -rw-r--r-- | drivers/pci/pci_rom.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index 67117c3..f737b7e 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -5,9 +5,11 @@ # SPDX-License-Identifier: GPL-2.0+ # +ifndef CONFIG_X86_64 obj-y += bios.o obj-y += bios_asm.o obj-y += bios_interrupts.o +endif obj-$(CONFIG_CMD_BOOTM) += bootm.o obj-y += cmd_boot.o obj-$(CONFIG_SEABIOS) += coreboot_table.o diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c index cd083f7..57204c4 100644 --- a/drivers/pci/pci_rom.c +++ b/drivers/pci/pci_rom.c @@ -334,7 +334,7 @@ int dm_pci_run_vga_bios(struct udevice *dev, int (*int15_handler)(void), goto err; #endif } else { -#ifdef CONFIG_X86 +#if defined(CONFIG_X86) && CONFIG_IS_ENABLED(X86_32BIT_INIT) bios_set_interrupt_handler(0x15, int15_handler); bios_run_on_x86(dev, (unsigned long)ram, vesa_mode, |