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

@@ -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

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>