diff options
| -rw-r--r-- | src/mainboard/kontron/ktqm77/Kconfig | 7 | ||||
| -rw-r--r-- | src/mainboard/samsung/lumpy/Kconfig | 6 | ||||
| -rw-r--r-- | src/mainboard/samsung/stumpy/Kconfig | 6 | ||||
| -rw-r--r-- | src/northbridge/intel/sandybridge/Kconfig | 11 | ||||
| -rw-r--r-- | src/northbridge/intel/sandybridge/Makefile.inc | 10 |
5 files changed, 5 insertions, 35 deletions
diff --git a/src/mainboard/kontron/ktqm77/Kconfig b/src/mainboard/kontron/ktqm77/Kconfig index 8ec7f3119c..781833b85a 100644 --- a/src/mainboard/kontron/ktqm77/Kconfig +++ b/src/mainboard/kontron/ktqm77/Kconfig @@ -13,13 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 16c9c613c8..5f0f49ff1e 100644 --- a/src/mainboard/samsung/lumpy/Kconfig +++ b/src/mainboard/samsung/lumpy/Kconfig @@ -20,12 +20,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 25b0727448..e511d8324e 100644 --- a/src/mainboard/samsung/stumpy/Kconfig +++ b/src/mainboard/samsung/stumpy/Kconfig @@ -17,12 +17,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 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 \ |