Patch set updated for coreboot: 0a5221a vendorcode/google: allow FMAP calls to be used without CONFIG_CHROMEOS set

[Matt DeVillier]

Matt DeVillier ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6025

-gerrit

commit 0a5221a5471b244cfe6553257018e6dd89f44cae
Author: Matt DeVillier 
Date:   Thu Jun 12 12:24:29 2014 -0500

vendorcode/google: allow FMAP calls to be used without CONFIG_CHROMEOS set

Some ChromeOS devices, like panther and zako, use fmap calls in
    lan initization, and need it compiled/included for non-CHROMEOS builds.
    Modify Makefile.inc to build fmap if CONFIG_MAINBOARD_HAS_CHROMEOS is set,
    but only build vboot and related components if CONFIG_CHROMEOS and
    CONFIG_VBOOT_VERIFY_FIRMWARE are set.

Change-Id: Id9fca877f0f58e0f7e48c284279b7fb89499ada4
    Signed-off-by: Matt DeVillier 
---
 src/vendorcode/google/Makefile.inc          |  2 +-
 src/vendorcode/google/chromeos/Makefile.inc | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/vendorcode/google/Makefile.inc b/src/vendorcode/google/Makefile.inc
index 20d40a8..a2a60e4 100644
--- a/src/vendorcode/google/Makefile.inc
+++ b/src/vendorcode/google/Makefile.inc
@@ -17,4 +17,4 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##

-subdirs-$(CONFIG_CHROMEOS) += chromeos
+subdirs-$(CONFIG_MAINBOARD_HAS_CHROMEOS) += chromeos
diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc
index 9bd5091..5682a86 100644
--- a/src/vendorcode/google/chromeos/Makefile.inc
+++ b/src/vendorcode/google/chromeos/Makefile.inc
@@ -17,10 +17,8 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##

-romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += vbnv.c
-ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += vbnv.c
-romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += vboot.c
-ramstage-y += gnvs.c
+
+ramstage-$(CONFIG_CHROMEOS) += gnvs.c
 romstage-y += fmap.c
 ramstage-y += fmap.c
 ramstage-$(CONFIG_CHROMEOS_RAMOOPS) += ramoops.c
@@ -33,6 +31,10 @@ CFLAGS_common += -DMOCK_TPM=0
 endif

ifeq ($(CONFIG_VBOOT_VERIFY_FIRMWARE),y)
+romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += vbnv.c
+ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += vbnv.c
+romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += vboot.c
+
 romstage-y += vboot_handoff.c
 ramstage-y += vboot_handoff.c
 romstage-y += vboot_loader.c