Vladimir Serbinenko (phcoder@gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13649
-gerrit
commit bb55bd1288abe46f1de9ee847df01a2fd18b46df Author: Vladimir Serbinenko phcoder@gmail.com Date: Tue Feb 9 21:50:45 2016 +0100
sandybridge: Set all native gfx-related options in northbridge code.
In the same time remove few native gfx options which were improperly set and only added dead code to the binary.
Change-Id: I4ed3fec03a1655ae0a779c3aa3845de273cb12e1 Signed-off-by: Vladimir Serbinenko phcoder@gmail.com --- src/mainboard/apple/macbookair4_2/Kconfig | 3 --- src/mainboard/gigabyte/ga-b75m-d3h/Kconfig | 2 -- src/mainboard/gigabyte/ga-b75m-d3v/Kconfig | 2 -- src/mainboard/lenovo/t420s/Kconfig | 4 ---- src/mainboard/lenovo/t430s/Kconfig | 4 ---- src/mainboard/lenovo/t520/Kconfig | 4 ---- src/mainboard/lenovo/t530/Kconfig | 4 ---- src/mainboard/lenovo/x220/Kconfig | 4 ---- src/mainboard/lenovo/x230/Kconfig | 4 ---- src/northbridge/intel/sandybridge/Kconfig | 17 +++++++++++++++++ util/autoport/sandybridge.go | 5 ----- 11 files changed, 17 insertions(+), 36 deletions(-)
diff --git a/src/mainboard/apple/macbookair4_2/Kconfig b/src/mainboard/apple/macbookair4_2/Kconfig index 6e47a7b..a626150 100644 --- a/src/mainboard/apple/macbookair4_2/Kconfig +++ b/src/mainboard/apple/macbookair4_2/Kconfig @@ -7,10 +7,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select EC_ACPI select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES - select INTEL_EDID - select INTEL_INT15 select NORTHBRIDGE_INTEL_SANDYBRIDGE - select SANDYBRIDGE_LVDS select SERIRQ_CONTINUOUS_MODE select SOUTHBRIDGE_INTEL_BD82X6X select SYSTEM_TYPE_LAPTOP diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig index 8a53bef..12386dc 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig +++ b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig @@ -14,8 +14,6 @@ config BOARD_SPECIFIC_OPTIONS select HAVE_ACPI_RESUME select HAVE_SMI_HANDLER select INTEL_INT15 - select VGA - select INTEL_EDID select UDELAY_TSC select SERIRQ_CONTINUOUS_MODE
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig index ede8021..d91ea58 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig +++ b/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig @@ -14,8 +14,6 @@ config BOARD_SPECIFIC_OPTIONS select HAVE_ACPI_RESUME select HAVE_SMI_HANDLER select INTEL_INT15 - select VGA - select INTEL_EDID select UDELAY_TSC select SERIRQ_CONTINUOUS_MODE
diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig index 65d37a7..d1a3980 100644 --- a/src/mainboard/lenovo/t420s/Kconfig +++ b/src/mainboard/lenovo/t420s/Kconfig @@ -15,10 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_CMOS_DEFAULT select HAVE_ACPI_RESUME select INTEL_INT15 - select VGA - select INTEL_EDID - select MAINBOARD_HAS_NATIVE_VGA_INIT - select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG select SANDYBRIDGE_LVDS select MAINBOARD_HAS_LPC_TPM
diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig index 6e257dd..b071777 100644 --- a/src/mainboard/lenovo/t430s/Kconfig +++ b/src/mainboard/lenovo/t430s/Kconfig @@ -15,10 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_CMOS_DEFAULT select HAVE_ACPI_RESUME select INTEL_INT15 - select VGA - select INTEL_EDID - select MAINBOARD_HAS_NATIVE_VGA_INIT - select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG select IVYBRIDGE_LVDS select ENABLE_VMX select MAINBOARD_HAS_LPC_TPM diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig index df7c2db..de53662 100644 --- a/src/mainboard/lenovo/t520/Kconfig +++ b/src/mainboard/lenovo/t520/Kconfig @@ -15,10 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_CMOS_DEFAULT select HAVE_ACPI_RESUME select INTEL_INT15 - select VGA - select INTEL_EDID - select MAINBOARD_HAS_NATIVE_VGA_INIT - select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG select SANDYBRIDGE_LVDS select MAINBOARD_HAS_LPC_TPM
diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig index 7b4ca7a..a9f3a44 100644 --- a/src/mainboard/lenovo/t530/Kconfig +++ b/src/mainboard/lenovo/t530/Kconfig @@ -15,10 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_CMOS_DEFAULT select HAVE_ACPI_RESUME select INTEL_INT15 - select VGA - select INTEL_EDID - select MAINBOARD_HAS_NATIVE_VGA_INIT - select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG select IVYBRIDGE_LVDS select MAINBOARD_DO_NATIVE_VGA_INIT # default to native vga init select ENABLE_VMX diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig index 02b9873..01a26ae 100644 --- a/src/mainboard/lenovo/x220/Kconfig +++ b/src/mainboard/lenovo/x220/Kconfig @@ -15,10 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_CMOS_DEFAULT select HAVE_ACPI_RESUME select INTEL_INT15 - select VGA - select INTEL_EDID - select MAINBOARD_HAS_NATIVE_VGA_INIT - select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG select SANDYBRIDGE_LVDS select DRIVERS_RICOH_RCE822 select MAINBOARD_HAS_LPC_TPM diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig index 1d336eb..2fffe2a 100644 --- a/src/mainboard/lenovo/x230/Kconfig +++ b/src/mainboard/lenovo/x230/Kconfig @@ -15,10 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_CMOS_DEFAULT select HAVE_ACPI_RESUME select INTEL_INT15 - select VGA - select INTEL_EDID - select MAINBOARD_HAS_NATIVE_VGA_INIT - select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG select IVYBRIDGE_LVDS select DRIVERS_RICOH_RCE822 select MAINBOARD_HAS_LPC_TPM diff --git a/src/northbridge/intel/sandybridge/Kconfig b/src/northbridge/intel/sandybridge/Kconfig index 3e517b1..f66d302 100644 --- a/src/northbridge/intel/sandybridge/Kconfig +++ b/src/northbridge/intel/sandybridge/Kconfig @@ -61,6 +61,23 @@ config SANDYBRIDGE_LVDS bool default n
+if SANDYBRIDGE_LVDS || IVYBRIDGE_LVDS + +config NATIVE_GFXINIT_PRESENT_SPECIFIC_OPTIONS # dummy + def_bool y + select MAINBOARD_HAS_NATIVE_VGA_INIT + select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG + +if MAINBOARD_DO_NATIVE_VGA_INIT + +config NATIVE_GFXINIT_ENABLED_SPECIFIC_OPTIONS # dummy + def_bool y + select VGA + select INTEL_EDID + +endif +endif + config MRC_CACHE_SIZE hex depends on !CHROMEOS diff --git a/util/autoport/sandybridge.go b/util/autoport/sandybridge.go index 191c69f..66d44d9 100644 --- a/util/autoport/sandybridge.go +++ b/util/autoport/sandybridge.go @@ -109,14 +109,9 @@ func (i sandybridgemc) Scan(ctx Context, addr PCIDevData) {
PutPCIDev(addr, "Host bridge")
- /* FIXME:XX Move part to northbridge? */ /* FIXME:XX some configs are unsupported. */ - KconfigBool["MAINBOARD_HAS_NATIVE_VGA_INIT"] = true - KconfigBool["MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG"] = true KconfigBool[i.variant+"BRIDGE_LVDS"] = true
- KconfigBool["VGA"] = true - KconfigBool["INTEL_EDID"] = true KconfigBool["CPU_INTEL_SOCKET_RPGA989"] = true KconfigBool["NORTHBRIDGE_INTEL_"+i.variant+"BRIDGE"] = true KconfigBool["INTEL_INT15"] = true