nb/intel/snb: Drop NORTHBRIDGE_INTEL_IVYBRIDGE
We keep the support, though. Just now that `libgfxinit` is fixed, we don't need the distinction anymore. Causally, we also don't need CPU_INTEL_MODEL_306AX any more. TEST=Played tint on kontron/ktqm77. Score 606 Change-Id: Id1e33c77f44a66baacba375cbb2aeb71effb7b76 Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/32737 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
parent
47953d0ae0
commit
772a154d39
|
@ -91,9 +91,7 @@
|
|||
_car_global_end = .;
|
||||
_car_relocatable_data_end = .;
|
||||
|
||||
#if (CONFIG(NORTHBRIDGE_INTEL_SANDYBRIDGE) || \
|
||||
CONFIG(NORTHBRIDGE_INTEL_IVYBRIDGE)) && \
|
||||
!CONFIG(USE_NATIVE_RAMINIT)
|
||||
#if CONFIG(NORTHBRIDGE_INTEL_SANDYBRIDGE) && !CONFIG(USE_NATIVE_RAMINIT)
|
||||
. = ABSOLUTE(0xff7e1000);
|
||||
_mrc_pool = .;
|
||||
. += 0x5000;
|
||||
|
|
|
@ -12,7 +12,6 @@ subdirs-$(CONFIG_CPU_INTEL_SOCKET_P) += socket_p
|
|||
subdirs-$(CONFIG_CPU_INTEL_SOCKET_MPGA604) += socket_mPGA604
|
||||
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_NEHALEM) += model_2065x
|
||||
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE) += model_206ax
|
||||
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE) += model_206ax
|
||||
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_HASWELL) += haswell
|
||||
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_FSP_RANGELEY) += fsp_model_406dx
|
||||
subdirs-$(CONFIG_CPU_INTEL_SLOT_1) += slot_1
|
||||
|
|
|
@ -1,10 +1,7 @@
|
|||
config CPU_INTEL_MODEL_206AX
|
||||
bool
|
||||
|
||||
config CPU_INTEL_MODEL_306AX
|
||||
bool
|
||||
|
||||
if CPU_INTEL_MODEL_206AX || CPU_INTEL_MODEL_306AX
|
||||
if CPU_INTEL_MODEL_206AX
|
||||
|
||||
config CPU_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
|
|
|
@ -67,7 +67,7 @@ config GFX_GMA
|
|||
def_bool y
|
||||
depends on NORTHBRIDGE_INTEL_GM45 || NORTHBRIDGE_INTEL_X4X \
|
||||
|| NORTHBRIDGE_INTEL_NEHALEM || NORTHBRIDGE_INTEL_SANDYBRIDGE \
|
||||
|| NORTHBRIDGE_INTEL_IVYBRIDGE || NORTHBRIDGE_INTEL_HASWELL \
|
||||
|| NORTHBRIDGE_INTEL_HASWELL \
|
||||
|| SOC_INTEL_BROADWELL || SOC_INTEL_SKYLAKE || SOC_INTEL_APOLLOLAKE
|
||||
depends on MAINBOARD_USE_LIBGFXINIT
|
||||
select RAMSTAGE_LIBHWBASE
|
||||
|
@ -96,7 +96,7 @@ config GFX_GMA_GENERATION
|
|||
default "Broxton" if SOC_INTEL_APOLLOLAKE
|
||||
default "Skylake" if SOC_INTEL_SKYLAKE
|
||||
default "Haswell" if NORTHBRIDGE_INTEL_HASWELL || SOC_INTEL_BROADWELL
|
||||
default "Ironlake" if NORTHBRIDGE_INTEL_NEHALEM || NORTHBRIDGE_INTEL_SANDYBRIDGE || NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
default "Ironlake" if NORTHBRIDGE_INTEL_NEHALEM || NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
default "G45" if NORTHBRIDGE_INTEL_GM45 || NORTHBRIDGE_INTEL_X4X
|
||||
|
||||
config GFX_GMA_INTERNAL_PORT
|
||||
|
|
|
@ -22,7 +22,7 @@ config BOARD_SPECIFIC_OPTIONS
|
|||
select HAVE_ACPI_RESUME
|
||||
select HAVE_ACPI_TABLES
|
||||
select INTEL_INT15
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select SERIRQ_CONTINUOUS_MODE
|
||||
select SOUTHBRIDGE_INTEL_C216
|
||||
select USE_NATIVE_RAMINIT
|
||||
|
|
|
@ -6,7 +6,7 @@ config BOARD_SPECIFIC_OPTIONS
|
|||
select HAVE_ACPI_RESUME
|
||||
select HAVE_ACPI_TABLES
|
||||
select INTEL_INT15
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select SERIRQ_CONTINUOUS_MODE
|
||||
select SOUTHBRIDGE_INTEL_BD82X6X
|
||||
select USE_NATIVE_RAMINIT
|
||||
|
|
|
@ -21,7 +21,7 @@ config BOARD_SPECIFIC_OPTIONS
|
|||
select BOARD_ROMSIZE_KB_4096
|
||||
select HAVE_ACPI_RESUME
|
||||
select HAVE_ACPI_TABLES
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select SERIRQ_CONTINUOUS_MODE
|
||||
select SOUTHBRIDGE_INTEL_BD82X6X
|
||||
select USE_NATIVE_RAMINIT
|
||||
|
|
|
@ -7,7 +7,7 @@ config BOARD_SPECIFIC_OPTIONS
|
|||
select HAVE_ACPI_RESUME
|
||||
select HAVE_ACPI_TABLES
|
||||
select INTEL_INT15
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select SERIRQ_CONTINUOUS_MODE
|
||||
select SOUTHBRIDGE_INTEL_C216
|
||||
select SYSTEM_TYPE_LAPTOP
|
||||
|
|
|
@ -3,7 +3,7 @@ if BOARD_GIGABYTE_GA_B75M_D3H
|
|||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select USE_NATIVE_RAMINIT
|
||||
select SOUTHBRIDGE_INTEL_C216
|
||||
select SUPERIO_ITE_IT8728F
|
||||
|
|
|
@ -3,7 +3,7 @@ if BOARD_GIGABYTE_GA_B75M_D3V
|
|||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select USE_NATIVE_RAMINIT
|
||||
select SOUTHBRIDGE_INTEL_C216
|
||||
select SUPERIO_ITE_IT8728F
|
||||
|
|
|
@ -3,7 +3,7 @@ if BOARD_GOOGLE_LINK
|
|||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select SYSTEM_TYPE_LAPTOP
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select SOUTHBRIDGE_INTEL_C216
|
||||
select BOARD_ROMSIZE_KB_8192
|
||||
select EC_GOOGLE_CHROMEEC
|
||||
|
|
|
@ -3,7 +3,7 @@ if BOARD_GOOGLE_PARROT
|
|||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select SYSTEM_TYPE_LAPTOP
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select SOUTHBRIDGE_INTEL_C216
|
||||
select EC_COMPAL_ENE932
|
||||
select BOARD_ROMSIZE_KB_8192
|
||||
|
|
|
@ -3,7 +3,7 @@ if BOARD_GOOGLE_STOUT
|
|||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select SYSTEM_TYPE_LAPTOP
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select SOUTHBRIDGE_INTEL_C216
|
||||
select EC_QUANTA_IT8518
|
||||
select BOARD_ROMSIZE_KB_8192
|
||||
|
|
|
@ -21,7 +21,7 @@ config BOARD_SPECIFIC_OPTIONS
|
|||
select HAVE_ACPI_RESUME
|
||||
select HAVE_ACPI_TABLES
|
||||
select INTEL_INT15
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select SERIRQ_CONTINUOUS_MODE
|
||||
select SOUTHBRIDGE_INTEL_C216
|
||||
select SYSTEM_TYPE_LAPTOP
|
||||
|
|
|
@ -21,7 +21,7 @@ config BOARD_SPECIFIC_OPTIONS
|
|||
select HAVE_ACPI_RESUME
|
||||
select HAVE_ACPI_TABLES
|
||||
select INTEL_INT15
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select SERIRQ_CONTINUOUS_MODE
|
||||
select SOUTHBRIDGE_INTEL_C216
|
||||
select SYSTEM_TYPE_LAPTOP
|
||||
|
|
|
@ -22,7 +22,7 @@ config BOARD_SPECIFIC_OPTIONS
|
|||
select HAVE_ACPI_RESUME
|
||||
select HAVE_ACPI_TABLES
|
||||
select INTEL_INT15
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select SERIRQ_CONTINUOUS_MODE
|
||||
select SOUTHBRIDGE_INTEL_C216
|
||||
select SYSTEM_TYPE_LAPTOP
|
||||
|
|
|
@ -7,7 +7,7 @@ config BOARD_SPECIFIC_OPTIONS
|
|||
select HAVE_ACPI_RESUME
|
||||
select HAVE_ACPI_TABLES
|
||||
select INTEL_INT15
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select SERIRQ_CONTINUOUS_MODE
|
||||
select SOUTHBRIDGE_INTEL_C216
|
||||
select SYSTEM_TYPE_LAPTOP
|
||||
|
|
|
@ -7,7 +7,7 @@ config BOARD_SPECIFIC_OPTIONS
|
|||
select HAVE_ACPI_RESUME
|
||||
select HAVE_ACPI_TABLES
|
||||
select INTEL_INT15
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select SERIRQ_CONTINUOUS_MODE
|
||||
select SOUTHBRIDGE_INTEL_C216
|
||||
select SYSTEM_TYPE_LAPTOP
|
||||
|
|
|
@ -2,7 +2,7 @@ if BOARD_INTEL_EMERALDLAKE2
|
|||
|
||||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select SOUTHBRIDGE_INTEL_C216
|
||||
select SUPERIO_SMSC_SIO1007
|
||||
select BOARD_ROMSIZE_KB_8192
|
||||
|
|
|
@ -2,7 +2,7 @@ if BOARD_KONTRON_KTQM77
|
|||
|
||||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select SOUTHBRIDGE_INTEL_C216
|
||||
select SUPERIO_WINBOND_W83627DHG
|
||||
select EC_KONTRON_IT8516E
|
||||
|
|
|
@ -3,7 +3,7 @@ if BOARD_LENOVO_S230U
|
|||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select SYSTEM_TYPE_LAPTOP
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select USE_NATIVE_RAMINIT
|
||||
select SOUTHBRIDGE_INTEL_C216
|
||||
select EC_COMPAL_ENE932
|
||||
|
|
|
@ -15,7 +15,7 @@ config BOARD_SPECIFIC_OPTIONS
|
|||
select MAINBOARD_HAS_LPC_TPM
|
||||
select MAINBOARD_HAS_TPM1
|
||||
select INTEL_INT15
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select SERIRQ_CONTINUOUS_MODE
|
||||
select SOUTHBRIDGE_INTEL_C216
|
||||
select SYSTEM_TYPE_LAPTOP
|
||||
|
|
|
@ -3,7 +3,7 @@ if BOARD_LENOVO_T430S || BOARD_LENOVO_T431S
|
|||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select SYSTEM_TYPE_LAPTOP
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select USE_NATIVE_RAMINIT
|
||||
select SOUTHBRIDGE_INTEL_C216
|
||||
select EC_LENOVO_PMH7
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
config BOARD_LENOVO_BASEBOARD_T530
|
||||
def_bool n
|
||||
select SYSTEM_TYPE_LAPTOP
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select USE_NATIVE_RAMINIT
|
||||
select SOUTHBRIDGE_INTEL_C216
|
||||
select EC_LENOVO_PMH7
|
||||
|
|
|
@ -3,7 +3,7 @@ if BOARD_LENOVO_X1_CARBON_GEN1
|
|||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select SYSTEM_TYPE_LAPTOP
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select USE_NATIVE_RAMINIT
|
||||
select SOUTHBRIDGE_INTEL_C216
|
||||
select EC_LENOVO_PMH7
|
||||
|
|
|
@ -3,7 +3,7 @@ if BOARD_LENOVO_X230
|
|||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select SYSTEM_TYPE_LAPTOP
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select USE_NATIVE_RAMINIT
|
||||
select SOUTHBRIDGE_INTEL_C216
|
||||
select EC_LENOVO_PMH7
|
||||
|
|
|
@ -3,7 +3,7 @@ if BOARD_RODA_RV11 || BOARD_RODA_RW11
|
|||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select SYSTEM_TYPE_LAPTOP
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select SOUTHBRIDGE_INTEL_C216
|
||||
select BOARD_ROMSIZE_KB_16384
|
||||
select HAVE_ACPI_TABLES
|
||||
|
|
|
@ -3,7 +3,7 @@ if BOARD_SAPPHIRE_PUREPLATINUMH61
|
|||
config BOARD_SPECIFIC_OPTIONS
|
||||
def_bool y
|
||||
select ARCH_X86
|
||||
select NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
select NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
select USE_NATIVE_RAMINIT
|
||||
select SOUTHBRIDGE_INTEL_BD82X6X
|
||||
select SUPERIO_FINTEK_F71808A
|
||||
|
|
|
@ -23,16 +23,7 @@ config NORTHBRIDGE_INTEL_SANDYBRIDGE
|
|||
select POSTCAR_STAGE
|
||||
select POSTCAR_CONSOLE
|
||||
|
||||
config NORTHBRIDGE_INTEL_IVYBRIDGE
|
||||
bool
|
||||
select CACHE_MRC_SETTINGS
|
||||
select CPU_INTEL_MODEL_306AX
|
||||
select HAVE_DEBUG_RAM_SETUP
|
||||
select INTEL_GMA_ACPI
|
||||
select POSTCAR_STAGE
|
||||
select POSTCAR_CONSOLE
|
||||
|
||||
if NORTHBRIDGE_INTEL_IVYBRIDGE || NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
if NORTHBRIDGE_INTEL_SANDYBRIDGE
|
||||
|
||||
config VBOOT
|
||||
select VBOOT_STARTS_IN_ROMSTAGE
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
# GNU General Public License for more details.
|
||||
#
|
||||
|
||||
ifeq ($(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE)$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE),y)
|
||||
ifeq ($(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE),y)
|
||||
|
||||
ramstage-y += ram_calc.c
|
||||
ramstage-y += northbridge.c
|
||||
|
|
|
@ -61,7 +61,7 @@ config CHECK_ME
|
|||
default n
|
||||
depends on HAVE_ME_BIN && (NORTHBRIDGE_INTEL_NEHALEM || \
|
||||
NORTHBRIDGE_INTEL_SANDYBRIDGE || \
|
||||
NORTHBRIDGE_INTEL_IVYBRIDGE || NORTHBRIDGE_INTEL_HASWELL || \
|
||||
NORTHBRIDGE_INTEL_HASWELL || \
|
||||
SOC_INTEL_BROADWELL || SOC_INTEL_SKYLAKE || \
|
||||
SOC_INTEL_KABYLAKE || SOC_INTEL_BAYTRAIL || SOC_INTEL_BRASWELL)
|
||||
help
|
||||
|
@ -73,7 +73,7 @@ config USE_ME_CLEANER
|
|||
bool "Strip down the Intel ME/TXE firmware"
|
||||
depends on HAVE_ME_BIN && (NORTHBRIDGE_INTEL_NEHALEM || \
|
||||
NORTHBRIDGE_INTEL_SANDYBRIDGE || \
|
||||
NORTHBRIDGE_INTEL_IVYBRIDGE || NORTHBRIDGE_INTEL_HASWELL || \
|
||||
NORTHBRIDGE_INTEL_HASWELL || \
|
||||
SOC_INTEL_BROADWELL || SOC_INTEL_SKYLAKE || \
|
||||
SOC_INTEL_KABYLAKE || SOC_INTEL_BAYTRAIL || SOC_INTEL_BRASWELL)
|
||||
help
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
package main
|
||||
|
||||
type sandybridgemc struct {
|
||||
variant string
|
||||
}
|
||||
|
||||
func (i sandybridgemc) Scan(ctx Context, addr PCIDevData) {
|
||||
|
@ -106,7 +105,7 @@ func (i sandybridgemc) Scan(ctx Context, addr PCIDevData) {
|
|||
PutPCIDev(addr, "Host bridge")
|
||||
|
||||
/* FIXME:XX some configs are unsupported. */
|
||||
KconfigBool["NORTHBRIDGE_INTEL_"+i.variant+"BRIDGE"] = true
|
||||
KconfigBool["NORTHBRIDGE_INTEL_SANDYBRIDGE"] = true
|
||||
KconfigBool["USE_NATIVE_RAMINIT"] = true
|
||||
KconfigBool["INTEL_INT15"] = true
|
||||
KconfigBool["HAVE_ACPI_TABLES"] = true
|
||||
|
@ -126,10 +125,10 @@ func (i sandybridgemc) Scan(ctx Context, addr PCIDevData) {
|
|||
}
|
||||
|
||||
func init() {
|
||||
RegisterPCI(0x8086, 0x0100, sandybridgemc{variant: "SANDY"})
|
||||
RegisterPCI(0x8086, 0x0104, sandybridgemc{variant: "SANDY"})
|
||||
RegisterPCI(0x8086, 0x0150, sandybridgemc{variant: "IVY"})
|
||||
RegisterPCI(0x8086, 0x0154, sandybridgemc{variant: "IVY"})
|
||||
RegisterPCI(0x8086, 0x0100, sandybridgemc{})
|
||||
RegisterPCI(0x8086, 0x0104, sandybridgemc{})
|
||||
RegisterPCI(0x8086, 0x0150, sandybridgemc{})
|
||||
RegisterPCI(0x8086, 0x0154, sandybridgemc{})
|
||||
for _, id := range []uint16{
|
||||
0x0102, 0x0106, 0x010a,
|
||||
0x0112, 0x0116, 0x0122, 0x0126,
|
||||
|
|
Loading…
Reference in New Issue