GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Nico Huber 2019-05-10 16:48:14 +02:00 committed by Nico Huber
parent 47953d0ae0
commit 772a154d39
32 changed files with 37 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/arch/x86/car.ld
View File

@ -91,9 +91,7 @@
_car_global_end = .; _car_global_end = .;
_car_relocatable_data_end = .; _car_relocatable_data_end = .;
#if (CONFIG(NORTHBRIDGE_INTEL_SANDYBRIDGE) || \ #if CONFIG(NORTHBRIDGE_INTEL_SANDYBRIDGE) && !CONFIG(USE_NATIVE_RAMINIT)
CONFIG(NORTHBRIDGE_INTEL_IVYBRIDGE)) && \
!CONFIG(USE_NATIVE_RAMINIT)
. = ABSOLUTE(0xff7e1000); . = ABSOLUTE(0xff7e1000);
_mrc_pool = .; _mrc_pool = .;
. += 0x5000; . += 0x5000;

1
src/cpu/intel/Makefile.inc
View File

@ -12,7 +12,6 @@ subdirs-$(CONFIG_CPU_INTEL_SOCKET_P) += socket_p
subdirs-$(CONFIG_CPU_INTEL_SOCKET_MPGA604) += socket_mPGA604 subdirs-$(CONFIG_CPU_INTEL_SOCKET_MPGA604) += socket_mPGA604
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_NEHALEM) += model_2065x subdirs-$(CONFIG_NORTHBRIDGE_INTEL_NEHALEM) += model_2065x
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE) += model_206ax subdirs-$(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE) += model_206ax
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE) += model_206ax
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_HASWELL) += haswell subdirs-$(CONFIG_NORTHBRIDGE_INTEL_HASWELL) += haswell
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_FSP_RANGELEY) += fsp_model_406dx subdirs-$(CONFIG_NORTHBRIDGE_INTEL_FSP_RANGELEY) += fsp_model_406dx
subdirs-$(CONFIG_CPU_INTEL_SLOT_1) += slot_1 subdirs-$(CONFIG_CPU_INTEL_SLOT_1) += slot_1

5
src/cpu/intel/model_206ax/Kconfig
View File

@ -1,10 +1,7 @@
config CPU_INTEL_MODEL_206AX config CPU_INTEL_MODEL_206AX
bool bool
config CPU_INTEL_MODEL_306AX if CPU_INTEL_MODEL_206AX
bool
if CPU_INTEL_MODEL_206AX || CPU_INTEL_MODEL_306AX
config CPU_SPECIFIC_OPTIONS config CPU_SPECIFIC_OPTIONS
def_bool y def_bool y

4
src/drivers/intel/gma/Kconfig
View File

@ -67,7 +67,7 @@ config GFX_GMA
def_bool y def_bool y
depends on NORTHBRIDGE_INTEL_GM45 || NORTHBRIDGE_INTEL_X4X \ depends on NORTHBRIDGE_INTEL_GM45 || NORTHBRIDGE_INTEL_X4X \
|| NORTHBRIDGE_INTEL_NEHALEM || NORTHBRIDGE_INTEL_SANDYBRIDGE \ || NORTHBRIDGE_INTEL_NEHALEM || NORTHBRIDGE_INTEL_SANDYBRIDGE \
|| NORTHBRIDGE_INTEL_IVYBRIDGE || NORTHBRIDGE_INTEL_HASWELL \ || NORTHBRIDGE_INTEL_HASWELL \
|| SOC_INTEL_BROADWELL || SOC_INTEL_SKYLAKE || SOC_INTEL_APOLLOLAKE || SOC_INTEL_BROADWELL || SOC_INTEL_SKYLAKE || SOC_INTEL_APOLLOLAKE
depends on MAINBOARD_USE_LIBGFXINIT depends on MAINBOARD_USE_LIBGFXINIT
select RAMSTAGE_LIBHWBASE select RAMSTAGE_LIBHWBASE
@ -96,7 +96,7 @@ config GFX_GMA_GENERATION
default "Broxton" if SOC_INTEL_APOLLOLAKE default "Broxton" if SOC_INTEL_APOLLOLAKE
default "Skylake" if SOC_INTEL_SKYLAKE default "Skylake" if SOC_INTEL_SKYLAKE
default "Haswell" if NORTHBRIDGE_INTEL_HASWELL || SOC_INTEL_BROADWELL 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 default "G45" if NORTHBRIDGE_INTEL_GM45 || NORTHBRIDGE_INTEL_X4X
config GFX_GMA_INTERNAL_PORT config GFX_GMA_INTERNAL_PORT

2
src/mainboard/asrock/b75pro3-m/Kconfig
View File

@ -22,7 +22,7 @@ config BOARD_SPECIFIC_OPTIONS
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select INTEL_INT15 select INTEL_INT15
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select SERIRQ_CONTINUOUS_MODE select SERIRQ_CONTINUOUS_MODE
select SOUTHBRIDGE_INTEL_C216 select SOUTHBRIDGE_INTEL_C216
select USE_NATIVE_RAMINIT select USE_NATIVE_RAMINIT

2
src/mainboard/asus/h61m-cs/Kconfig
View File

@ -6,7 +6,7 @@ config BOARD_SPECIFIC_OPTIONS
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select INTEL_INT15 select INTEL_INT15
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select SERIRQ_CONTINUOUS_MODE select SERIRQ_CONTINUOUS_MODE
select SOUTHBRIDGE_INTEL_BD82X6X select SOUTHBRIDGE_INTEL_BD82X6X
select USE_NATIVE_RAMINIT select USE_NATIVE_RAMINIT

2
src/mainboard/asus/p8h61-m_pro/Kconfig
View File

@ -21,7 +21,7 @@ config BOARD_SPECIFIC_OPTIONS
select BOARD_ROMSIZE_KB_4096 select BOARD_ROMSIZE_KB_4096
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select SERIRQ_CONTINUOUS_MODE select SERIRQ_CONTINUOUS_MODE
select SOUTHBRIDGE_INTEL_BD82X6X select SOUTHBRIDGE_INTEL_BD82X6X
select USE_NATIVE_RAMINIT select USE_NATIVE_RAMINIT

2
src/mainboard/compulab/intense_pc/Kconfig
View File

@ -7,7 +7,7 @@ config BOARD_SPECIFIC_OPTIONS
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select INTEL_INT15 select INTEL_INT15
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select SERIRQ_CONTINUOUS_MODE select SERIRQ_CONTINUOUS_MODE
select SOUTHBRIDGE_INTEL_C216 select SOUTHBRIDGE_INTEL_C216
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP

2
src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
View File

@ -3,7 +3,7 @@ if BOARD_GIGABYTE_GA_B75M_D3H
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select ARCH_X86 select ARCH_X86
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select USE_NATIVE_RAMINIT select USE_NATIVE_RAMINIT
select SOUTHBRIDGE_INTEL_C216 select SOUTHBRIDGE_INTEL_C216
select SUPERIO_ITE_IT8728F select SUPERIO_ITE_IT8728F

2
src/mainboard/gigabyte/ga-b75m-d3v/Kconfig
View File

@ -3,7 +3,7 @@ if BOARD_GIGABYTE_GA_B75M_D3V
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select ARCH_X86 select ARCH_X86
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select USE_NATIVE_RAMINIT select USE_NATIVE_RAMINIT
select SOUTHBRIDGE_INTEL_C216 select SOUTHBRIDGE_INTEL_C216
select SUPERIO_ITE_IT8728F select SUPERIO_ITE_IT8728F

2
src/mainboard/google/link/Kconfig
View File

@ -3,7 +3,7 @@ if BOARD_GOOGLE_LINK
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select SOUTHBRIDGE_INTEL_C216 select SOUTHBRIDGE_INTEL_C216
select BOARD_ROMSIZE_KB_8192 select BOARD_ROMSIZE_KB_8192
select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC

2
src/mainboard/google/parrot/Kconfig
View File

@ -3,7 +3,7 @@ if BOARD_GOOGLE_PARROT
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select SOUTHBRIDGE_INTEL_C216 select SOUTHBRIDGE_INTEL_C216
select EC_COMPAL_ENE932 select EC_COMPAL_ENE932
select BOARD_ROMSIZE_KB_8192 select BOARD_ROMSIZE_KB_8192

2
src/mainboard/google/stout/Kconfig
View File

@ -3,7 +3,7 @@ if BOARD_GOOGLE_STOUT
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select SOUTHBRIDGE_INTEL_C216 select SOUTHBRIDGE_INTEL_C216
select EC_QUANTA_IT8518 select EC_QUANTA_IT8518
select BOARD_ROMSIZE_KB_8192 select BOARD_ROMSIZE_KB_8192

2
src/mainboard/hp/2570p/Kconfig
View File

@ -21,7 +21,7 @@ config BOARD_SPECIFIC_OPTIONS
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select INTEL_INT15 select INTEL_INT15
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select SERIRQ_CONTINUOUS_MODE select SERIRQ_CONTINUOUS_MODE
select SOUTHBRIDGE_INTEL_C216 select SOUTHBRIDGE_INTEL_C216
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP

2
src/mainboard/hp/8470p/Kconfig
View File

@ -21,7 +21,7 @@ config BOARD_SPECIFIC_OPTIONS
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select INTEL_INT15 select INTEL_INT15
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select SERIRQ_CONTINUOUS_MODE select SERIRQ_CONTINUOUS_MODE
select SOUTHBRIDGE_INTEL_C216 select SOUTHBRIDGE_INTEL_C216
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP

2
src/mainboard/hp/8770w/Kconfig
View File

@ -22,7 +22,7 @@ config BOARD_SPECIFIC_OPTIONS
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select INTEL_INT15 select INTEL_INT15
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select SERIRQ_CONTINUOUS_MODE select SERIRQ_CONTINUOUS_MODE
select SOUTHBRIDGE_INTEL_C216 select SOUTHBRIDGE_INTEL_C216
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP

2
src/mainboard/hp/folio_9470m/Kconfig
View File

@ -7,7 +7,7 @@ config BOARD_SPECIFIC_OPTIONS
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select INTEL_INT15 select INTEL_INT15
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select SERIRQ_CONTINUOUS_MODE select SERIRQ_CONTINUOUS_MODE
select SOUTHBRIDGE_INTEL_C216 select SOUTHBRIDGE_INTEL_C216
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP

2
src/mainboard/hp/revolve_810_g1/Kconfig
View File

@ -7,7 +7,7 @@ config BOARD_SPECIFIC_OPTIONS
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select INTEL_INT15 select INTEL_INT15
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select SERIRQ_CONTINUOUS_MODE select SERIRQ_CONTINUOUS_MODE
select SOUTHBRIDGE_INTEL_C216 select SOUTHBRIDGE_INTEL_C216
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP

2
src/mainboard/intel/emeraldlake2/Kconfig
View File

@ -2,7 +2,7 @@ if BOARD_INTEL_EMERALDLAKE2
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select SOUTHBRIDGE_INTEL_C216 select SOUTHBRIDGE_INTEL_C216
select SUPERIO_SMSC_SIO1007 select SUPERIO_SMSC_SIO1007
select BOARD_ROMSIZE_KB_8192 select BOARD_ROMSIZE_KB_8192

2
src/mainboard/kontron/ktqm77/Kconfig
View File

@ -2,7 +2,7 @@ if BOARD_KONTRON_KTQM77
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select SOUTHBRIDGE_INTEL_C216 select SOUTHBRIDGE_INTEL_C216
select SUPERIO_WINBOND_W83627DHG select SUPERIO_WINBOND_W83627DHG
select EC_KONTRON_IT8516E select EC_KONTRON_IT8516E

2
src/mainboard/lenovo/s230u/Kconfig
View File

@ -3,7 +3,7 @@ if BOARD_LENOVO_S230U
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select USE_NATIVE_RAMINIT select USE_NATIVE_RAMINIT
select SOUTHBRIDGE_INTEL_C216 select SOUTHBRIDGE_INTEL_C216
select EC_COMPAL_ENE932 select EC_COMPAL_ENE932

2
src/mainboard/lenovo/t430/Kconfig
View File

@ -15,7 +15,7 @@ config BOARD_SPECIFIC_OPTIONS
select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_LPC_TPM
select MAINBOARD_HAS_TPM1 select MAINBOARD_HAS_TPM1
select INTEL_INT15 select INTEL_INT15
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select SERIRQ_CONTINUOUS_MODE select SERIRQ_CONTINUOUS_MODE
select SOUTHBRIDGE_INTEL_C216 select SOUTHBRIDGE_INTEL_C216
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP

2
src/mainboard/lenovo/t430s/Kconfig
View File

@ -3,7 +3,7 @@ if BOARD_LENOVO_T430S || BOARD_LENOVO_T431S
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select USE_NATIVE_RAMINIT select USE_NATIVE_RAMINIT
select SOUTHBRIDGE_INTEL_C216 select SOUTHBRIDGE_INTEL_C216
select EC_LENOVO_PMH7 select EC_LENOVO_PMH7

2
src/mainboard/lenovo/t530/Kconfig
View File

@ -1,7 +1,7 @@
config BOARD_LENOVO_BASEBOARD_T530 config BOARD_LENOVO_BASEBOARD_T530
def_bool n def_bool n
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select USE_NATIVE_RAMINIT select USE_NATIVE_RAMINIT
select SOUTHBRIDGE_INTEL_C216 select SOUTHBRIDGE_INTEL_C216
select EC_LENOVO_PMH7 select EC_LENOVO_PMH7

2
src/mainboard/lenovo/x1_carbon_gen1/Kconfig
View File

@ -3,7 +3,7 @@ if BOARD_LENOVO_X1_CARBON_GEN1
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select USE_NATIVE_RAMINIT select USE_NATIVE_RAMINIT
select SOUTHBRIDGE_INTEL_C216 select SOUTHBRIDGE_INTEL_C216
select EC_LENOVO_PMH7 select EC_LENOVO_PMH7

2
src/mainboard/lenovo/x230/Kconfig
View File

@ -3,7 +3,7 @@ if BOARD_LENOVO_X230
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select USE_NATIVE_RAMINIT select USE_NATIVE_RAMINIT
select SOUTHBRIDGE_INTEL_C216 select SOUTHBRIDGE_INTEL_C216
select EC_LENOVO_PMH7 select EC_LENOVO_PMH7

2
src/mainboard/roda/rv11/Kconfig
View File

@ -3,7 +3,7 @@ if BOARD_RODA_RV11 || BOARD_RODA_RW11
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select SYSTEM_TYPE_LAPTOP select SYSTEM_TYPE_LAPTOP
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select SOUTHBRIDGE_INTEL_C216 select SOUTHBRIDGE_INTEL_C216
select BOARD_ROMSIZE_KB_16384 select BOARD_ROMSIZE_KB_16384
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES

2
src/mainboard/sapphire/pureplatinumh61/Kconfig
View File

@ -3,7 +3,7 @@ if BOARD_SAPPHIRE_PUREPLATINUMH61
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select ARCH_X86 select ARCH_X86
select NORTHBRIDGE_INTEL_IVYBRIDGE select NORTHBRIDGE_INTEL_SANDYBRIDGE
select USE_NATIVE_RAMINIT select USE_NATIVE_RAMINIT
select SOUTHBRIDGE_INTEL_BD82X6X select SOUTHBRIDGE_INTEL_BD82X6X
select SUPERIO_FINTEK_F71808A select SUPERIO_FINTEK_F71808A

11
src/northbridge/intel/sandybridge/Kconfig
View File

@ -23,16 +23,7 @@ config NORTHBRIDGE_INTEL_SANDYBRIDGE
select POSTCAR_STAGE select POSTCAR_STAGE
select POSTCAR_CONSOLE select POSTCAR_CONSOLE
config NORTHBRIDGE_INTEL_IVYBRIDGE if NORTHBRIDGE_INTEL_SANDYBRIDGE
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
config VBOOT config VBOOT
select VBOOT_STARTS_IN_ROMSTAGE select VBOOT_STARTS_IN_ROMSTAGE

2
src/northbridge/intel/sandybridge/Makefile.inc
View File

@ -13,7 +13,7 @@
# GNU General Public License for more details. # 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 += ram_calc.c
ramstage-y += northbridge.c ramstage-y += northbridge.c

4
src/southbridge/intel/common/firmware/Kconfig
View File

@ -61,7 +61,7 @@ config CHECK_ME
default n default n
depends on HAVE_ME_BIN && (NORTHBRIDGE_INTEL_NEHALEM || \ depends on HAVE_ME_BIN && (NORTHBRIDGE_INTEL_NEHALEM || \
NORTHBRIDGE_INTEL_SANDYBRIDGE || \ NORTHBRIDGE_INTEL_SANDYBRIDGE || \
NORTHBRIDGE_INTEL_IVYBRIDGE || NORTHBRIDGE_INTEL_HASWELL || \ NORTHBRIDGE_INTEL_HASWELL || \
SOC_INTEL_BROADWELL || SOC_INTEL_SKYLAKE || \ SOC_INTEL_BROADWELL || SOC_INTEL_SKYLAKE || \
SOC_INTEL_KABYLAKE || SOC_INTEL_BAYTRAIL || SOC_INTEL_BRASWELL) SOC_INTEL_KABYLAKE || SOC_INTEL_BAYTRAIL || SOC_INTEL_BRASWELL)
help help
@ -73,7 +73,7 @@ config USE_ME_CLEANER
bool "Strip down the Intel ME/TXE firmware" bool "Strip down the Intel ME/TXE firmware"
depends on HAVE_ME_BIN && (NORTHBRIDGE_INTEL_NEHALEM || \ depends on HAVE_ME_BIN && (NORTHBRIDGE_INTEL_NEHALEM || \
NORTHBRIDGE_INTEL_SANDYBRIDGE || \ NORTHBRIDGE_INTEL_SANDYBRIDGE || \
NORTHBRIDGE_INTEL_IVYBRIDGE || NORTHBRIDGE_INTEL_HASWELL || \ NORTHBRIDGE_INTEL_HASWELL || \
SOC_INTEL_BROADWELL || SOC_INTEL_SKYLAKE || \ SOC_INTEL_BROADWELL || SOC_INTEL_SKYLAKE || \
SOC_INTEL_KABYLAKE || SOC_INTEL_BAYTRAIL || SOC_INTEL_BRASWELL) SOC_INTEL_KABYLAKE || SOC_INTEL_BAYTRAIL || SOC_INTEL_BRASWELL)
help help

11
util/autoport/sandybridge.go
View File

@ -1,7 +1,6 @@
package main package main
type sandybridgemc struct { type sandybridgemc struct {
variant string
} }
func (i sandybridgemc) Scan(ctx Context, addr PCIDevData) { func (i sandybridgemc) Scan(ctx Context, addr PCIDevData) {
@ -106,7 +105,7 @@ func (i sandybridgemc) Scan(ctx Context, addr PCIDevData) {
PutPCIDev(addr, "Host bridge") PutPCIDev(addr, "Host bridge")
/* FIXME:XX some configs are unsupported. */ /* FIXME:XX some configs are unsupported. */
KconfigBool["NORTHBRIDGE_INTEL_"+i.variant+"BRIDGE"] = true KconfigBool["NORTHBRIDGE_INTEL_SANDYBRIDGE"] = true
KconfigBool["USE_NATIVE_RAMINIT"] = true KconfigBool["USE_NATIVE_RAMINIT"] = true
KconfigBool["INTEL_INT15"] = true KconfigBool["INTEL_INT15"] = true
KconfigBool["HAVE_ACPI_TABLES"] = true KconfigBool["HAVE_ACPI_TABLES"] = true
@ -126,10 +125,10 @@ func (i sandybridgemc) Scan(ctx Context, addr PCIDevData) {
} }
func init() { func init() {
RegisterPCI(0x8086, 0x0100, sandybridgemc{variant: "SANDY"}) RegisterPCI(0x8086, 0x0100, sandybridgemc{})
RegisterPCI(0x8086, 0x0104, sandybridgemc{variant: "SANDY"}) RegisterPCI(0x8086, 0x0104, sandybridgemc{})
RegisterPCI(0x8086, 0x0150, sandybridgemc{variant: "IVY"}) RegisterPCI(0x8086, 0x0150, sandybridgemc{})
RegisterPCI(0x8086, 0x0154, sandybridgemc{variant: "IVY"}) RegisterPCI(0x8086, 0x0154, sandybridgemc{})
for _, id := range []uint16{ for _, id := range []uint16{
0x0102, 0x0106, 0x010a, 0x0102, 0x0106, 0x010a,
0x0112, 0x0116, 0x0122, 0x0126, 0x0112, 0x0116, 0x0122, 0x0126,