diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 9d4c83e675..89c057f7fa 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -89,7 +89,7 @@ ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += edid.c
 ramstage-y += memrange.c
 ramstage-$(CONFIG_COOP_MULTITASKING) += thread.c
 ramstage-$(CONFIG_TIMER_QUEUE) += timer_queue.c
-ramstage--${CONFIG_TERTIARY_BOARD_ID} += tristate_gpios.c
+ramstage-$(CONFIG_TERTIARY_BOARD_ID) += tristate_gpios.c
 
 # The CBMEM implementations are chosen based on CONFIG_DYNAMIC_CBMEM.
 ifeq ($(CONFIG_DYNAMIC_CBMEM),y)
diff --git a/src/mainboard/google/nyan/Makefile.inc b/src/mainboard/google/nyan/Makefile.inc
index 3c2b5da30f..8d905c26b2 100644
--- a/src/mainboard/google/nyan/Makefile.inc
+++ b/src/mainboard/google/nyan/Makefile.inc
@@ -36,4 +36,5 @@ romstage-y += reset.c
 romstage-y += romstage.c
 romstage-y += sdram_configs.c
 
+ramstage-y += boardid.c
 ramstage-y += mainboard.c
diff --git a/src/mainboard/google/nyan_big/Makefile.inc b/src/mainboard/google/nyan_big/Makefile.inc
index 3c2b5da30f..9faba250d4 100644
--- a/src/mainboard/google/nyan_big/Makefile.inc
+++ b/src/mainboard/google/nyan_big/Makefile.inc
@@ -27,7 +27,6 @@ $(obj)/generated/bct.cfg:
 
 subdirs-y += bct
 
-bootblock-y += boardid.c
 bootblock-y += bootblock.c
 bootblock-y += pmic.c
 bootblock-y += reset.c
@@ -36,4 +35,5 @@ romstage-y += reset.c
 romstage-y += romstage.c
 romstage-y += sdram_configs.c
 
+ramstage-y += boardid.c
 ramstage-y += mainboard.c
diff --git a/src/mainboard/google/nyan_blaze/Makefile.inc b/src/mainboard/google/nyan_blaze/Makefile.inc
index 88ca298aa5..e269fe48f3 100644
--- a/src/mainboard/google/nyan_blaze/Makefile.inc
+++ b/src/mainboard/google/nyan_blaze/Makefile.inc
@@ -27,7 +27,6 @@ $(obj)/generated/bct.cfg:
 
 subdirs-y += bct
 
-bootblock-y += boardid.c
 bootblock-y += bootblock.c
 bootblock-y += pmic.c
 bootblock-y += reset.c
@@ -39,4 +38,5 @@ romstage-y += reset.c
 romstage-y += romstage.c
 romstage-y += sdram_configs.c
 
+ramstage-y += boardid.c
 ramstage-y += mainboard.c
diff --git a/src/mainboard/google/rush/Makefile.inc b/src/mainboard/google/rush/Makefile.inc
index 0472d5edd1..9b2d44e37e 100644
--- a/src/mainboard/google/rush/Makefile.inc
+++ b/src/mainboard/google/rush/Makefile.inc
@@ -27,7 +27,6 @@ $(obj)/generated/bct.cfg:
 
 subdirs-y += bct
 
-bootblock-y += boardid.c
 bootblock-y += bootblock.c
 bootblock-y += pmic.c
 bootblock-y += reset.c
@@ -38,5 +37,6 @@ romstage-y += sdram_configs.c
 romstage-y += chromeos.c
 romstage-y += ec_dummy.c
 
+ramstage-y += boardid.c
 ramstage-y += mainboard.c
 ramstage-y += ec_dummy.c
diff --git a/src/mainboard/google/rush_ryu/Makefile.inc b/src/mainboard/google/rush_ryu/Makefile.inc
index 3c2b5da30f..9faba250d4 100644
--- a/src/mainboard/google/rush_ryu/Makefile.inc
+++ b/src/mainboard/google/rush_ryu/Makefile.inc
@@ -27,7 +27,6 @@ $(obj)/generated/bct.cfg:
 
 subdirs-y += bct
 
-bootblock-y += boardid.c
 bootblock-y += bootblock.c
 bootblock-y += pmic.c
 bootblock-y += reset.c
@@ -36,4 +35,5 @@ romstage-y += reset.c
 romstage-y += romstage.c
 romstage-y += sdram_configs.c
 
+ramstage-y += boardid.c
 ramstage-y += mainboard.c