mb/asus/h61-series: Always select `INTEL_INT15`
The mainboard.c guard was only added to preserve reproducibility when
unifying the boards. The `install_intel_vga_int15_handler` function does
nothing when `VGA_ROM_RUN` is not selected. Remove the guard and always
select `INTEL_INT15` for simplicity.
Change-Id: If51a0ab1c57b0856018a62cf669e5d1b53e5333c
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/54379
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
diff --git a/src/mainboard/asus/h61-series/Kconfig b/src/mainboard/asus/h61-series/Kconfig
index cadc984..e776a54 100644
--- a/src/mainboard/asus/h61-series/Kconfig
+++ b/src/mainboard/asus/h61-series/Kconfig
@@ -5,6 +5,7 @@
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
select INTEL_GMA_HAVE_VBT
+ select INTEL_INT15
select MAINBOARD_HAS_LIBGFXINIT
select NORTHBRIDGE_INTEL_SANDYBRIDGE
select SERIRQ_CONTINUOUS_MODE
diff --git a/src/mainboard/asus/h61-series/Kconfig.name b/src/mainboard/asus/h61-series/Kconfig.name
index c531188..087dd92 100644
--- a/src/mainboard/asus/h61-series/Kconfig.name
+++ b/src/mainboard/asus/h61-series/Kconfig.name
@@ -4,7 +4,6 @@
select BOARD_ROMSIZE_KB_8192
select HAVE_CMOS_DEFAULT
select HAVE_OPTION_TABLE
- select INTEL_INT15
select NO_UART_ON_SUPERIO
select SUPERIO_NUVOTON_NCT6779D
@@ -14,7 +13,6 @@
select BOARD_ROMSIZE_KB_4096
select HAVE_CMOS_DEFAULT
select HAVE_OPTION_TABLE
- select INTEL_INT15
select REALTEK_8168_RESET
select RT8168_SET_LED_MODE
select SUPERIO_NUVOTON_COMMON_COM_A
diff --git a/src/mainboard/asus/h61-series/mainboard.c b/src/mainboard/asus/h61-series/mainboard.c
index 48fcdce..c834fea 100644
--- a/src/mainboard/asus/h61-series/mainboard.c
+++ b/src/mainboard/asus/h61-series/mainboard.c
@@ -1,8 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-/* TODO: remove */
-#if CONFIG(INTEL_INT15)
-
#include <device/device.h>
#include <drivers/intel/gma/int15.h>
@@ -16,5 +13,3 @@
struct chip_operations mainboard_ops = {
.enable_dev = mainboard_enable,
};
-
-#endif