summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/console/Kconfig2
-rw-r--r--src/device/pci_rom.c2
-rw-r--r--src/drivers/emulation/qemu/Kconfig2
-rw-r--r--src/mainboard/emulation/Kconfig5
4 files changed, 3 insertions, 8 deletions
diff --git a/src/console/Kconfig b/src/console/Kconfig
index cc18ec3756..b893698a20 100644
--- a/src/console/Kconfig
+++ b/src/console/Kconfig
@@ -280,7 +280,7 @@ config CONSOLE_SPI_FLASH_BUFFER_SIZE
config CONSOLE_QEMU_DEBUGCON
bool "QEMU debug console output"
- depends on BOARD_EMULATION_QEMU_X86
+ depends on CPU_QEMU_X86
default y
help
Send coreboot debug output to QEMU's isa-debugcon device:
diff --git a/src/device/pci_rom.c b/src/device/pci_rom.c
index 3676f9cf9b..816255d5e1 100644
--- a/src/device/pci_rom.c
+++ b/src/device/pci_rom.c
@@ -59,7 +59,7 @@ struct rom_header *pci_rom_probe(struct device *dev)
rom_address = pci_read_config32(dev, PCI_ROM_ADDRESS);
if (rom_address == 0x00000000 || rom_address == 0xffffffff) {
-#if CONFIG(BOARD_EMULATION_QEMU_X86)
+#if CONFIG(CPU_QEMU_X86)
if ((dev->class >> 8) == PCI_CLASS_DISPLAY_VGA)
rom_address = 0xc0000;
else
diff --git a/src/drivers/emulation/qemu/Kconfig b/src/drivers/emulation/qemu/Kconfig
index 58daaa4487..c271825f23 100644
--- a/src/drivers/emulation/qemu/Kconfig
+++ b/src/drivers/emulation/qemu/Kconfig
@@ -1,7 +1,7 @@
config DRIVERS_EMULATION_QEMU_BOCHS
bool "bochs dispi interface vga driver"
default y
- depends on BOARD_EMULATION_QEMU_X86
+ depends on CPU_QEMU_X86
depends on MAINBOARD_DO_NATIVE_VGA_INIT
select HAVE_VGA_TEXT_FRAMEBUFFER
select HAVE_LINEAR_FRAMEBUFFER
diff --git a/src/mainboard/emulation/Kconfig b/src/mainboard/emulation/Kconfig
index e069cf0faa..45790b1842 100644
--- a/src/mainboard/emulation/Kconfig
+++ b/src/mainboard/emulation/Kconfig
@@ -8,11 +8,6 @@ source "src/mainboard/emulation/*/Kconfig.name"
endchoice
-config BOARD_EMULATION_QEMU_X86
- bool
- default y
- depends on CPU_QEMU_X86
-
source "src/mainboard/emulation/*/Kconfig"
config MAINBOARD_VENDOR