diff options
| author | Vladimir Serbinenko <phcoder@gmail.com> | 2016-02-12 19:23:02 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2016-02-13 08:25:25 +0100 |
| commit | bd82d18ee5396d9e7a1a5ba101725c8ceff0e3fb (patch) | |
| tree | 5d9b8f32410013238d0d907728c63fed0354ef1f /src/northbridge/intel/sandybridge | |
| parent | c370fe37ad31e80e027d0afed400323fa1b4d328 (diff) | |
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>
Diffstat (limited to 'src/northbridge/intel/sandybridge')
| -rw-r--r-- | src/northbridge/intel/sandybridge/Kconfig | 11 | ||||
| -rw-r--r-- | src/northbridge/intel/sandybridge/Makefile.inc | 10 |
2 files changed, 5 insertions, 16 deletions
diff --git a/src/northbridge/intel/sandybridge/Kconfig b/src/northbridge/intel/sandybridge/Kconfig index 5b7284872a..f435f856f6 100644 --- a/src/northbridge/intel/sandybridge/Kconfig +++ b/src/northbridge/intel/sandybridge/Kconfig @@ -88,18 +88,9 @@ config DCACHE_RAM_MRC_VAR_SIZE hex 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 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" help The path and filename of the file to use as System Agent diff --git a/src/northbridge/intel/sandybridge/Makefile.inc b/src/northbridge/intel/sandybridge/Makefile.inc index 7a3c498b2c..a58d9b1f69 100644 --- a/src/northbridge/intel/sandybridge/Makefile.inc +++ b/src/northbridge/intel/sandybridge/Makefile.inc @@ -30,6 +30,10 @@ romstage-y += raminit.c romstage-y += ../../../device/dram/ddr3.c else 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 romstage-y += romstage.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) += 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) $(obj)/mrc.cache: $(obj)/config.h dd if=/dev/zero count=1 \ |