4 files changed, 3 insertions, 8 deletions
diff --git a/src/devices/Kconfig b/src/devices/Kconfig
index 3d0049e28d..9e5ea6e094 100644
--- a/src/devices/Kconfig
+++ b/src/devices/Kconfig
@@ -116,7 +116,7 @@ config YABEL_DIRECTHW
 	  they can still access all devices in the system.
 	  Enable this option for a good compromise between security and speed.
 
-config CONSOLE_VGA_MULTI
+config MULTIPLE_VGA_ADAPTERS
 	bool
 	default n
 
diff --git a/src/devices/device.c b/src/devices/device.c
index 4143f96d66..a2619bf000 100644
--- a/src/devices/device.c
+++ b/src/devices/device.c
@@ -722,7 +722,7 @@ static void set_vga_bridge_bits(void)
 	if (!vga)
 		vga = vga_first;
 
-#if CONFIG_CONSOLE_VGA_ONBOARD_AT_FIRST == 1
+#if CONFIG_ONBOARD_VGA_IS_PRIMARY == 1
 	if (vga_onboard)	/* Will use onboard VGA as primary. */
 #else
 	if (!vga)		/* Will use last add-on adapter as primary. */
diff --git a/src/devices/pci_device.c b/src/devices/pci_device.c
index 01fd815f4d..ed066900e4 100644
--- a/src/devices/pci_device.c
+++ b/src/devices/pci_device.c
@@ -675,11 +675,6 @@ void pci_dev_init(struct device *dev)
 		return;
 
 	run_bios(dev, (unsigned long)ram);
-
-#if CONFIG_CONSOLE_VGA == 1
-	if ((dev->class >> 8) == PCI_CLASS_DISPLAY_VGA)
-		vga_console_init();
-#endif /* CONFIG_CONSOLE_VGA */
 #endif /* CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN */
 }
 
diff --git a/src/devices/pci_rom.c b/src/devices/pci_rom.c
index 1ae79e137d..e721eb5751 100644
--- a/src/devices/pci_rom.c
+++ b/src/devices/pci_rom.c
@@ -130,7 +130,7 @@ struct rom_header *pci_rom_load(struct device *dev,
 	 * devices have a mismatch between the hardware and the ROM.
 	 */
  	if (PCI_CLASS_DISPLAY_VGA == (dev->class >> 8)) {
-#if CONFIG_CONSOLE_VGA == 1 && CONFIG_CONSOLE_VGA_MULTI == 0
+#if CONFIG_MULTIPLE_VGA_ADAPTERS == 0
 		extern device_t vga_pri; /* Primary VGA device (device.c). */
 		if (dev != vga_pri) return NULL; /* Only one VGA supported. */
 #endif