From e3fe4e7572a60cf7444ee87228edb509d020e0b7 Mon Sep 17 00:00:00 2001
From: Patrick Georgi <pgeorgi@chromium.org>
Date: Tue, 30 Jun 2015 21:58:45 +0200
Subject: [PATCH] google/foster: roll up fixes to compile with vboot

Change-Id: I796e0fa64f9a858a54b09a82fbec1f0576e7e124
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: http://review.coreboot.org/10732
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: build bot (Jenkins)
---
 src/mainboard/google/foster/Makefile.inc | 1 +
 src/mainboard/google/foster/memlayout.ld | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mainboard/google/foster/Makefile.inc b/src/mainboard/google/foster/Makefile.inc
index 29478c0649..f9fd32bc8c 100644
--- a/src/mainboard/google/foster/Makefile.inc
+++ b/src/mainboard/google/foster/Makefile.inc
@@ -43,6 +43,7 @@ romstage-y += chromeos.c
 ramstage-y += boardid.c
 ramstage-y += mainboard.c
 ramstage-y += reset.c
+ramstage-y += chromeos.c
 
 bootblock-y += memlayout.ld
 romstage-y += memlayout.ld
diff --git a/src/mainboard/google/foster/memlayout.ld b/src/mainboard/google/foster/memlayout.ld
index a71dcb8508..c53f7449ac 100644
--- a/src/mainboard/google/foster/memlayout.ld
+++ b/src/mainboard/google/foster/memlayout.ld
@@ -1,4 +1,4 @@
-#if IS_ENABLED(CONFIG_VBOOT2_VERIFY_FIRMWARE)
+#if IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE)
 #include <soc/memlayout_vboot2.ld>
 #else
 #include <soc/memlayout.ld>