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

sandybridge: Always include MRC if not using native RAM init. 

Otherwise the image is simply unusable.

Change-Id: I1e2562ba17279d14dc73b05e4f8fa493e06fbcd2
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: https://review.coreboot.org/13699
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Vladimir Serbinenko 2016-02-12 19:23:02 +01:00 committed by Patrick Georgi
parent c370fe37ad
commit bd82d18ee5
5 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,13 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select ENABLE_VMX select ENABLE_VMX
if !USE_NATIVE_RAMINIT
config BOARD_SPECIFIC_OPTIONS_MRC # dummy
def_bool y
select HAVE_MRC
endif
config MAINBOARD_DIR config MAINBOARD_DIR
string string
default kontron/ktqm77 default kontron/ktqm77

6
src/mainboard/samsung/lumpy/Kconfig
View File

@ -20,12 +20,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select DRIVERS_GENERIC_IOAPIC select DRIVERS_GENERIC_IOAPIC
select INTEL_INT15 select INTEL_INT15
if !USE_NATIVE_RAMINIT
config BOARD_SPECIFIC_OPTIONS_MRC # dummy
def_bool y
select HAVE_MRC
endif
config CHROMEOS config CHROMEOS
select CHROMEOS_VBNV_CMOS select CHROMEOS_VBNV_CMOS

6
src/mainboard/samsung/stumpy/Kconfig
View File

@ -17,12 +17,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SUPERIO_SMSC_LPC47N207 select SUPERIO_SMSC_LPC47N207
select INTEL_INT15 select INTEL_INT15
if !USE_NATIVE_RAMINIT
config BOARD_SPECIFIC_OPTIONS_MRC # dummy
def_bool y
select HAVE_MRC
endif
config CHROMEOS config CHROMEOS
select PHYSICAL_REC_SWITCH select PHYSICAL_REC_SWITCH
select CHROMEOS_VBNV_CMOS select CHROMEOS_VBNV_CMOS

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

@ -88,18 +88,9 @@ config DCACHE_RAM_MRC_VAR_SIZE
hex hex
default 0x4000 default 0x4000
config HAVE_MRC
bool "Add a System Agent binary"
depends on !USE_NATIVE_RAMINIT
help
Select this option to add a System Agent binary to
the resulting coreboot image.
Note: Without this binary coreboot will not work
config MRC_FILE config MRC_FILE
string "Intel System Agent path and filename" string "Intel System Agent path and filename"
depends on HAVE_MRC depends on !USE_NATIVE_RAMINIT
default "3rdparty/blobs/northbridge/intel/sandybridge/systemagent-r6.bin" default "3rdparty/blobs/northbridge/intel/sandybridge/systemagent-r6.bin"
help help
The path and filename of the file to use as System Agent The path and filename of the file to use as System Agent

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

@ -30,6 +30,10 @@ romstage-y += raminit.c
romstage-y += ../../../device/dram/ddr3.c romstage-y += ../../../device/dram/ddr3.c
else else
romstage-y += raminit_mrc.c romstage-y += raminit_mrc.c
cbfs-files-y += mrc.bin
mrc.bin-file := $(call strip_quotes,$(CONFIG_MRC_FILE))
mrc.bin-position := 0xfffa0000
mrc.bin-type := mrc
endif endif
romstage-y += romstage.c romstage-y += romstage.c
romstage-y += mrccache.c romstage-y += mrccache.c
@ -41,12 +45,6 @@ romstage-y += ../../../arch/x86/walkcbfs.S
smm-$(CONFIG_HAVE_SMI_HANDLER) += udelay.c smm-$(CONFIG_HAVE_SMI_HANDLER) += udelay.c
smm-$(CONFIG_HAVE_SMI_HANDLER) += finalize.c smm-$(CONFIG_HAVE_SMI_HANDLER) += finalize.c
# We don't ship that, but booting without it is bound to fail
cbfs-files-$(CONFIG_HAVE_MRC) += mrc.bin
mrc.bin-file := $(call strip_quotes,$(CONFIG_MRC_FILE))
mrc.bin-position := 0xfffa0000
mrc.bin-type := mrc
ifneq ($(CONFIG_CHROMEOS),y) ifneq ($(CONFIG_CHROMEOS),y)
$(obj)/mrc.cache: $(obj)/config.h $(obj)/mrc.cache: $(obj)/config.h
dd if=/dev/zero count=1 \ dd if=/dev/zero count=1 \