Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/54412 )
Change subject: mb/asus/p8z77-series: Always select `INTEL_INT15` ......................................................................
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 th3fanbus@gmail.com --- M src/mainboard/asus/p8z77-series/Kconfig M src/mainboard/asus/p8z77-series/Kconfig.name M src/mainboard/asus/p8z77-series/mainboard.c 3 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/12/54412/1
diff --git a/src/mainboard/asus/p8z77-series/Kconfig b/src/mainboard/asus/p8z77-series/Kconfig index 8927ff5..d09b3cb 100644 --- a/src/mainboard/asus/p8z77-series/Kconfig +++ b/src/mainboard/asus/p8z77-series/Kconfig @@ -7,6 +7,7 @@ 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 44dae81..d4725b4 100644 --- a/src/mainboard/asus/p8z77-series/Kconfig.name +++ b/src/mainboard/asus/p8z77-series/Kconfig.name @@ -3,7 +3,6 @@ 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 bc45baf..ac992f6 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 <device/device.h> #include <drivers/intel/gma/int15.h>
@@ -17,5 +14,3 @@ struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable }; - -#endif