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>
diff --git a/src/mainboard/kontron/ktqm77/Kconfig b/src/mainboard/kontron/ktqm77/Kconfig
index 8ec7f31..781833b 100644
--- a/src/mainboard/kontron/ktqm77/Kconfig
+++ b/src/mainboard/kontron/ktqm77/Kconfig
@@ -13,13 +13,6 @@
select HAVE_ACPI_RESUME
select ENABLE_VMX
-if !USE_NATIVE_RAMINIT
-config BOARD_SPECIFIC_OPTIONS_MRC # dummy
- def_bool y
- select HAVE_MRC
-endif
-
-
config MAINBOARD_DIR
string
default kontron/ktqm77
diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig
index 16c9c61..5f0f49f 100644
--- a/src/mainboard/samsung/lumpy/Kconfig
+++ b/src/mainboard/samsung/lumpy/Kconfig
@@ -20,12 +20,6 @@
select DRIVERS_GENERIC_IOAPIC
select INTEL_INT15
-if !USE_NATIVE_RAMINIT
-config BOARD_SPECIFIC_OPTIONS_MRC # dummy
- def_bool y
- select HAVE_MRC
-endif
-
config CHROMEOS
select CHROMEOS_VBNV_CMOS
diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig
index 25b0727..e511d83 100644
--- a/src/mainboard/samsung/stumpy/Kconfig
+++ b/src/mainboard/samsung/stumpy/Kconfig
@@ -17,12 +17,6 @@
select SUPERIO_SMSC_LPC47N207
select INTEL_INT15
-if !USE_NATIVE_RAMINIT
-config BOARD_SPECIFIC_OPTIONS_MRC # dummy
- def_bool y
- select HAVE_MRC
-endif
-
config CHROMEOS
select PHYSICAL_REC_SWITCH
select CHROMEOS_VBNV_CMOS
diff --git a/src/northbridge/intel/sandybridge/Kconfig b/src/northbridge/intel/sandybridge/Kconfig
index 5b72848..f435f85 100644
--- a/src/northbridge/intel/sandybridge/Kconfig
+++ b/src/northbridge/intel/sandybridge/Kconfig
@@ -88,18 +88,9 @@
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 7a3c498..a58d9b1 100644
--- a/src/northbridge/intel/sandybridge/Makefile.inc
+++ b/src/northbridge/intel/sandybridge/Makefile.inc
@@ -30,6 +30,10 @@
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 @@
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 \