[coreboot-gerrit] Patch set updated for coreboot: 01ff7f0 google/rambi: Re-add option to hardcode location of spd.bin

[Alexandru Gagniuc (mr.nuke.me@gmail.com)]

Alexandru Gagniuc (mr.nuke.me at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5212

-gerrit

commit 01ff7f0e3efd452376f5516d178aa5d970d0f979
Author: Stefan Reinauer <stefan.reinauer at coreboot.org>
Date:   Thu Feb 13 00:16:56 2014 +0100

    google/rambi: Re-add option to hardcode location of spd.bin
    
    This is a partial revert of:
     * 76e25b6 google boards: Do not hardcode location of spd.bin
    
    Hardcoding the location of spd.bin is apparently useful during
    manufacturing. Exactly how and why is irrelevant for coreboot master,
    but we try to be a good citizen and accomodate all reasonable use
    cases. As such, allow the location of spd.bin to be specified when
    running a CHROMEOS build.
    
    This also removes the "select CHROMEOS" from rambi, as the correct
    variable should be "MAINBOARD_HAS_CHROMEOS", while "CHROMEOS" is
    reserved for the user.
    
    Change-Id: I6ca0238e9a11566ec1129a16b5cd507d9951cbd3
    Signed-off-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>
---
 src/mainboard/google/rambi/Kconfig          | 8 +++++++-
 src/mainboard/google/rambi/spd/Makefile.inc | 4 ++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig
index 292d321..d316feb 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_RESUME
 	select MAINBOARD_HAS_CHROMEOS
-	select CHROMEOS
 
 config MAINBOARD_DIR
 	string
@@ -32,4 +31,11 @@ config HAVE_ME_BIN
 	bool
 	default n
 
+# Positioning spd.bin at a fixed address is useful during manufacturing, but
+# offers no benefit otherwise, hence only present the option with ChromeOS
+config SPD_CBFS_ADDRESS
+	depends on CHROMEOS
+	hex "Location of SPD in CBFS"
+	default 0xfffec000
+
 endif # BOARD_INTEL_BAYLEYBAY
diff --git a/src/mainboard/google/rambi/spd/Makefile.inc b/src/mainboard/google/rambi/spd/Makefile.inc
index 36f4b66..0ec7b39 100644
--- a/src/mainboard/google/rambi/spd/Makefile.inc
+++ b/src/mainboard/google/rambi/spd/Makefile.inc
@@ -43,3 +43,7 @@ $(SPD_BIN): $(SPD_DEPS)
 cbfs-files-y += spd.bin
 spd.bin-file := $(SPD_BIN)
 spd.bin-type := 0xab
+# See comment in rambi/Kconfig for why this is done like this
+ifeq ($(CONFIG_CHROMEOS),y)
+spd.bin-position := $(CONFIG_SPD_CBFS_ADDRESS)
+endif