From e9da6c11f6103ba1ee184838aac6104bc77485d9 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Mon, 17 May 2021 17:58:47 +0200 Subject: mb/asus/p8z77-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: If38ca49dba81921a3e7abe22542ae74d8914a38d Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/54412 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/mainboard/asus/p8z77-series/Kconfig | 1 + src/mainboard/asus/p8z77-series/Kconfig.name | 1 - src/mainboard/asus/p8z77-series/mainboard.c | 5 ----- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/mainboard/asus/p8z77-series/Kconfig b/src/mainboard/asus/p8z77-series/Kconfig index 8927ff5fd5..d09b3cb7b5 100644 --- a/src/mainboard/asus/p8z77-series/Kconfig +++ b/src/mainboard/asus/p8z77-series/Kconfig @@ -7,6 +7,7 @@ config BOARD_ASUS_P8Z77_SERIES select HAVE_CMOS_DEFAULT select HAVE_OPTION_TABLE 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/p8z77-series/Kconfig.name b/src/mainboard/asus/p8z77-series/Kconfig.name index 44dae8127a..d4725b4e34 100644 --- a/src/mainboard/asus/p8z77-series/Kconfig.name +++ b/src/mainboard/asus/p8z77-series/Kconfig.name @@ -3,7 +3,6 @@ config BOARD_ASUS_P8Z77_M_PRO select BOARD_ASUS_P8Z77_SERIES select BOARD_ROMSIZE_KB_8192 select DRIVERS_ASMEDIA_ASPM_BLACKLIST # for ASM1061 eSATA - select INTEL_INT15 select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_TPM1 select SUPERIO_NUVOTON_NCT6779D diff --git a/src/mainboard/asus/p8z77-series/mainboard.c b/src/mainboard/asus/p8z77-series/mainboard.c index bc45baf8a7..ac992f6ffb 100644 --- a/src/mainboard/asus/p8z77-series/mainboard.c +++ b/src/mainboard/asus/p8z77-series/mainboard.c @@ -1,8 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* TODO: remove */ -#if CONFIG(INTEL_INT15) - #include #include @@ -17,5 +14,3 @@ static void mainboard_enable(struct device *dev) struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable }; - -#endif -- cgit v1.2.3