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> Reviewed-on: https://review.coreboot.org/13649 Reviewed-by: Martin Roth <martinroth@google.com> Tested-by: build bot (Jenkins)
This commit is contained in:
parent
f80331f261
commit
b2eea81992
|
@ -7,10 +7,8 @@ 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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -54,12 +54,19 @@ config CACHE_MRC_SIZE_KB
|
|||
default 512
|
||||
|
||||
config IVYBRIDGE_LVDS
|
||||
bool
|
||||
default n
|
||||
def_bool n
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
||||
|
||||
config SANDYBRIDGE_LVDS
|
||||
bool
|
||||
default n
|
||||
def_bool n
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||
select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
|
||||
|
||||
# Select VGA & INTEL_EDID if MAINBOARD_DO_NATIVE_VGA_INIT is enabled.
|
||||
config MAINBOARD_DO_NATIVE_VGA_INIT
|
||||
select VGA
|
||||
select INTEL_EDID
|
||||
|
||||
config MRC_CACHE_SIZE
|
||||
hex
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue