sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/asus/h61-series: Always select INTEL_INT15

Browse Source 
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>
This commit is contained in:
Angel Pons
2021-05-17 14:12:49 +02:00
committed by Patrick Georgi
parent 3ec960a482
commit 13d5d98bd5
3 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/mainboard/asus/h61-series/Kconfig
View File

@@ -5,6 +5,7 @@ config BOARD_ASUS_H61_SERIES
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select INTEL_GMA_HAVE_VBT select INTEL_GMA_HAVE_VBT
select INTEL_INT15
select MAINBOARD_HAS_LIBGFXINIT select MAINBOARD_HAS_LIBGFXINIT
select NORTHBRIDGE_INTEL_SANDYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select SERIRQ_CONTINUOUS_MODE select SERIRQ_CONTINUOUS_MODE

2
src/mainboard/asus/h61-series/Kconfig.name
View File

@@ -4,7 +4,6 @@ config BOARD_ASUS_H61M_CS
select BOARD_ROMSIZE_KB_8192 select BOARD_ROMSIZE_KB_8192
select HAVE_CMOS_DEFAULT select HAVE_CMOS_DEFAULT
select HAVE_OPTION_TABLE select HAVE_OPTION_TABLE
select INTEL_INT15
select NO_UART_ON_SUPERIO select NO_UART_ON_SUPERIO
select SUPERIO_NUVOTON_NCT6779D select SUPERIO_NUVOTON_NCT6779D
@@ -14,7 +13,6 @@ config BOARD_ASUS_P8H61_M_LX
select BOARD_ROMSIZE_KB_4096 select BOARD_ROMSIZE_KB_4096
select HAVE_CMOS_DEFAULT select HAVE_CMOS_DEFAULT
select HAVE_OPTION_TABLE select HAVE_OPTION_TABLE
select INTEL_INT15
select REALTEK_8168_RESET select REALTEK_8168_RESET
select RT8168_SET_LED_MODE select RT8168_SET_LED_MODE
select SUPERIO_NUVOTON_COMMON_COM_A select SUPERIO_NUVOTON_COMMON_COM_A

5
src/mainboard/asus/h61-series/mainboard.c
View File

@@ -1,8 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
/* TODO: remove */
#if CONFIG(INTEL_INT15)
#include <device/device.h> #include <device/device.h>
#include <drivers/intel/gma/int15.h> #include <drivers/intel/gma/int15.h>
@@ -16,5 +13,3 @@ static void mainboard_enable(struct device *dev)
struct chip_operations mainboard_ops = { struct chip_operations mainboard_ops = {
.enable_dev = mainboard_enable, .enable_dev = mainboard_enable,
}; };
#endif