61 files changed, 1 insertions, 1 deletions
diff --git a/src/mainboard/google/gale/Makefile.inc b/src/mainboard/google/gale/Makefile.mk
index f23f804de5..f23f804de5 100644
--- a/src/mainboard/google/gale/Makefile.inc
+++ b/src/mainboard/google/gale/Makefile.mk
diff --git a/src/mainboard/google/geralt/Makefile.inc b/src/mainboard/google/geralt/Makefile.mk
index b1af289d55..b1af289d55 100644
--- a/src/mainboard/google/geralt/Makefile.inc
+++ b/src/mainboard/google/geralt/Makefile.mk
diff --git a/src/mainboard/google/glados/Makefile.inc b/src/mainboard/google/glados/Makefile.mk
index 9fd41f89a7..9fd41f89a7 100644
--- a/src/mainboard/google/glados/Makefile.inc
+++ b/src/mainboard/google/glados/Makefile.mk
diff --git a/src/mainboard/google/glados/variants/asuka/Makefile.inc b/src/mainboard/google/glados/variants/asuka/Makefile.mk
index d1b4d16ba0..d1b4d16ba0 100644
--- a/src/mainboard/google/glados/variants/asuka/Makefile.inc
+++ b/src/mainboard/google/glados/variants/asuka/Makefile.mk
diff --git a/src/mainboard/google/glados/variants/caroline/Makefile.inc b/src/mainboard/google/glados/variants/caroline/Makefile.mk
index 6a942ee456..6a942ee456 100644
--- a/src/mainboard/google/glados/variants/caroline/Makefile.inc
+++ b/src/mainboard/google/glados/variants/caroline/Makefile.mk
diff --git a/src/mainboard/google/glados/variants/cave/Makefile.inc b/src/mainboard/google/glados/variants/cave/Makefile.mk
index 88e450ed6f..88e450ed6f 100644
--- a/src/mainboard/google/glados/variants/cave/Makefile.inc
+++ b/src/mainboard/google/glados/variants/cave/Makefile.mk
diff --git a/src/mainboard/google/glados/variants/chell/Makefile.inc b/src/mainboard/google/glados/variants/chell/Makefile.mk
index 53861e9839..53861e9839 100644
--- a/src/mainboard/google/glados/variants/chell/Makefile.inc
+++ b/src/mainboard/google/glados/variants/chell/Makefile.mk
diff --git a/src/mainboard/google/glados/variants/glados/Makefile.inc b/src/mainboard/google/glados/variants/glados/Makefile.mk
index 8858453cfc..8858453cfc 100644
--- a/src/mainboard/google/glados/variants/glados/Makefile.inc
+++ b/src/mainboard/google/glados/variants/glados/Makefile.mk
diff --git a/src/mainboard/google/glados/variants/lars/Makefile.inc b/src/mainboard/google/glados/variants/lars/Makefile.mk
index f295a360c2..f295a360c2 100644
--- a/src/mainboard/google/glados/variants/lars/Makefile.inc
+++ b/src/mainboard/google/glados/variants/lars/Makefile.mk
diff --git a/src/mainboard/google/glados/variants/sentry/Makefile.inc b/src/mainboard/google/glados/variants/sentry/Makefile.mk
index 4de16c951a..4de16c951a 100644
--- a/src/mainboard/google/glados/variants/sentry/Makefile.inc
+++ b/src/mainboard/google/glados/variants/sentry/Makefile.mk
diff --git a/src/mainboard/google/gru/Makefile.inc b/src/mainboard/google/gru/Makefile.mk
index b800945466..b800945466 100644
--- a/src/mainboard/google/gru/Makefile.inc
+++ b/src/mainboard/google/gru/Makefile.mk
diff --git a/src/mainboard/google/gru/sdram_params/Makefile.inc b/src/mainboard/google/gru/sdram_params/Makefile.mk
index 3314c0af91..3314c0af91 100644
--- a/src/mainboard/google/gru/sdram_params/Makefile.inc
+++ b/src/mainboard/google/gru/sdram_params/Makefile.mk
diff --git a/src/mainboard/google/guybrush/Makefile.inc b/src/mainboard/google/guybrush/Makefile.mk
index fd03124dcd..fd03124dcd 100644
--- a/src/mainboard/google/guybrush/Makefile.inc
+++ b/src/mainboard/google/guybrush/Makefile.mk
diff --git a/src/mainboard/google/guybrush/variants/baseboard/Makefile.inc b/src/mainboard/google/guybrush/variants/baseboard/Makefile.mk
index 74d030dd74..74d030dd74 100644
--- a/src/mainboard/google/guybrush/variants/baseboard/Makefile.inc
+++ b/src/mainboard/google/guybrush/variants/baseboard/Makefile.mk
diff --git a/src/mainboard/google/guybrush/variants/dewatt/Makefile.inc b/src/mainboard/google/guybrush/variants/dewatt/Makefile.mk
index 823860b4a3..823860b4a3 100644
--- a/src/mainboard/google/guybrush/variants/dewatt/Makefile.inc
+++ b/src/mainboard/google/guybrush/variants/dewatt/Makefile.mk
diff --git a/src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.inc b/src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.mk
index c6b64cf35a..c6b64cf35a 100644
--- a/src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.inc
+++ b/src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.mk
diff --git a/src/mainboard/google/guybrush/variants/guybrush/Makefile.inc b/src/mainboard/google/guybrush/variants/guybrush/Makefile.mk
index fa2c4dec38..fa2c4dec38 100644
--- a/src/mainboard/google/guybrush/variants/guybrush/Makefile.inc
+++ b/src/mainboard/google/guybrush/variants/guybrush/Makefile.mk
diff --git a/src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.inc b/src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.mk
index 2b86d005c4..2b86d005c4 100644
--- a/src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.inc
+++ b/src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.mk
diff --git a/src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc b/src/mainboard/google/guybrush/variants/nipperkin/Makefile.mk
index e166093f7c..e166093f7c 100644
--- a/src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc
+++ b/src/mainboard/google/guybrush/variants/nipperkin/Makefile.mk
diff --git a/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc b/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.mk
index 9becda6ba8..9becda6ba8 100644
--- a/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc
+++ b/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.mk
diff --git a/src/mainboard/google/hatch/Makefile.inc b/src/mainboard/google/hatch/Makefile.mk
index c1bd77a1f4..c1bd77a1f4 100644
--- a/src/mainboard/google/hatch/Makefile.inc
+++ b/src/mainboard/google/hatch/Makefile.mk
diff --git a/src/mainboard/google/hatch/variants/akemi/Makefile.inc b/src/mainboard/google/hatch/variants/akemi/Makefile.mk
index 0285219153..0285219153 100644
--- a/src/mainboard/google/hatch/variants/akemi/Makefile.inc
+++ b/src/mainboard/google/hatch/variants/akemi/Makefile.mk
diff --git a/src/mainboard/google/hatch/variants/baseboard/Makefile.inc b/src/mainboard/google/hatch/variants/baseboard/Makefile.mk
index c0514376ac..c0514376ac 100644
--- a/src/mainboard/google/hatch/variants/baseboard/Makefile.inc
+++ b/src/mainboard/google/hatch/variants/baseboard/Makefile.mk
diff --git a/src/mainboard/google/hatch/variants/dratini/Makefile.inc b/src/mainboard/google/hatch/variants/dratini/Makefile.mk
index 0180d5a0f0..0180d5a0f0 100644
--- a/src/mainboard/google/hatch/variants/dratini/Makefile.inc
+++ b/src/mainboard/google/hatch/variants/dratini/Makefile.mk
diff --git a/src/mainboard/google/hatch/variants/hatch/Makefile.inc b/src/mainboard/google/hatch/variants/hatch/Makefile.mk
index b6c3162f1d..b6c3162f1d 100644
--- a/src/mainboard/google/hatch/variants/hatch/Makefile.inc
+++ b/src/mainboard/google/hatch/variants/hatch/Makefile.mk
diff --git a/src/mainboard/google/hatch/variants/helios/Makefile.inc b/src/mainboard/google/hatch/variants/helios/Makefile.mk
index b980e9bea5..b980e9bea5 100644
--- a/src/mainboard/google/hatch/variants/helios/Makefile.inc
+++ b/src/mainboard/google/hatch/variants/helios/Makefile.mk
diff --git a/src/mainboard/google/hatch/variants/jinlon/Makefile.inc b/src/mainboard/google/hatch/variants/jinlon/Makefile.mk
index 5f7912b355..5f7912b355 100644
--- a/src/mainboard/google/hatch/variants/jinlon/Makefile.inc
+++ b/src/mainboard/google/hatch/variants/jinlon/Makefile.mk
diff --git a/src/mainboard/google/hatch/variants/kindred/Makefile.inc b/src/mainboard/google/hatch/variants/kindred/Makefile.mk
index 767e119dbc..767e119dbc 100644
--- a/src/mainboard/google/hatch/variants/kindred/Makefile.inc
+++ b/src/mainboard/google/hatch/variants/kindred/Makefile.mk
diff --git a/src/mainboard/google/hatch/variants/kohaku/Makefile.inc b/src/mainboard/google/hatch/variants/kohaku/Makefile.mk
index 3e5c58173c..3e5c58173c 100644
--- a/src/mainboard/google/hatch/variants/kohaku/Makefile.inc
+++ b/src/mainboard/google/hatch/variants/kohaku/Makefile.mk
diff --git a/src/mainboard/google/hatch/variants/mushu/Makefile.inc b/src/mainboard/google/hatch/variants/mushu/Makefile.mk
index b6c3162f1d..b6c3162f1d 100644
--- a/src/mainboard/google/hatch/variants/mushu/Makefile.inc
+++ b/src/mainboard/google/hatch/variants/mushu/Makefile.mk
diff --git a/src/mainboard/google/hatch/variants/nightfury/Makefile.inc b/src/mainboard/google/hatch/variants/nightfury/Makefile.mk
index a856f44082..a856f44082 100644
--- a/src/mainboard/google/hatch/variants/nightfury/Makefile.inc
+++ b/src/mainboard/google/hatch/variants/nightfury/Makefile.mk
diff --git a/src/mainboard/google/hatch/variants/palkia/Makefile.inc b/src/mainboard/google/hatch/variants/palkia/Makefile.mk
index a6a72229ae..a6a72229ae 100644
--- a/src/mainboard/google/hatch/variants/palkia/Makefile.inc
+++ b/src/mainboard/google/hatch/variants/palkia/Makefile.mk
diff --git a/src/mainboard/google/herobrine/Makefile.inc b/src/mainboard/google/herobrine/Makefile.mk
index a80779946d..a80779946d 100644
--- a/src/mainboard/google/herobrine/Makefile.inc
+++ b/src/mainboard/google/herobrine/Makefile.mk
diff --git a/src/mainboard/google/jecht/Makefile.inc b/src/mainboard/google/jecht/Makefile.mk
index ed74d75109..ed74d75109 100644
--- a/src/mainboard/google/jecht/Makefile.inc
+++ b/src/mainboard/google/jecht/Makefile.mk
diff --git a/src/mainboard/google/jecht/spd/Makefile.inc b/src/mainboard/google/jecht/spd/Makefile.mk
index 6ecc95b482..6ecc95b482 100644
--- a/src/mainboard/google/jecht/spd/Makefile.inc
+++ b/src/mainboard/google/jecht/spd/Makefile.mk
diff --git a/src/mainboard/google/kahlee/Makefile.inc b/src/mainboard/google/kahlee/Makefile.mk
index 94705922a6..94705922a6 100644
--- a/src/mainboard/google/kahlee/Makefile.inc
+++ b/src/mainboard/google/kahlee/Makefile.mk
diff --git a/src/mainboard/google/kahlee/variants/aleena/Makefile.inc b/src/mainboard/google/kahlee/variants/aleena/Makefile.mk
index 3a8e8607ad..3a8e8607ad 100644
--- a/src/mainboard/google/kahlee/variants/aleena/Makefile.inc
+++ b/src/mainboard/google/kahlee/variants/aleena/Makefile.mk
diff --git a/src/mainboard/google/kahlee/variants/baseboard/Makefile.inc b/src/mainboard/google/kahlee/variants/baseboard/Makefile.mk
index be4074d28c..be4074d28c 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/Makefile.inc
+++ b/src/mainboard/google/kahlee/variants/baseboard/Makefile.mk
diff --git a/src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.inc b/src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.mk
index 1ec3342891..1ec3342891 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.inc
+++ b/src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.mk
diff --git a/src/mainboard/google/kahlee/variants/careena/Makefile.inc b/src/mainboard/google/kahlee/variants/careena/Makefile.mk
index 57d8bf1349..57d8bf1349 100644
--- a/src/mainboard/google/kahlee/variants/careena/Makefile.inc
+++ b/src/mainboard/google/kahlee/variants/careena/Makefile.mk
diff --git a/src/mainboard/google/kahlee/variants/careena/spd/Makefile.inc b/src/mainboard/google/kahlee/variants/careena/spd/Makefile.mk
index 4c1da68f3d..4c1da68f3d 100644
--- a/src/mainboard/google/kahlee/variants/careena/spd/Makefile.inc
+++ b/src/mainboard/google/kahlee/variants/careena/spd/Makefile.mk
diff --git a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc b/src/mainboard/google/kahlee/variants/grunt/Makefile.mk
index 3a8e8607ad..3a8e8607ad 100644
--- a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc
+++ b/src/mainboard/google/kahlee/variants/grunt/Makefile.mk
diff --git a/src/mainboard/google/kahlee/variants/liara/Makefile.inc b/src/mainboard/google/kahlee/variants/liara/Makefile.mk
index 3a8e8607ad..3a8e8607ad 100644
--- a/src/mainboard/google/kahlee/variants/liara/Makefile.inc
+++ b/src/mainboard/google/kahlee/variants/liara/Makefile.mk
diff --git a/src/mainboard/google/kahlee/variants/nuwani/Makefile.inc b/src/mainboard/google/kahlee/variants/nuwani/Makefile.mk
index 21b0276a72..21b0276a72 100644
--- a/src/mainboard/google/kahlee/variants/nuwani/Makefile.inc
+++ b/src/mainboard/google/kahlee/variants/nuwani/Makefile.mk
diff --git a/src/mainboard/google/kahlee/variants/nuwani/spd/Makefile.inc b/src/mainboard/google/kahlee/variants/nuwani/spd/Makefile.mk
index e72c9e6d7a..e72c9e6d7a 100644
--- a/src/mainboard/google/kahlee/variants/nuwani/spd/Makefile.inc
+++ b/src/mainboard/google/kahlee/variants/nuwani/spd/Makefile.mk
diff --git a/src/mainboard/google/kahlee/variants/treeya/Makefile.inc b/src/mainboard/google/kahlee/variants/treeya/Makefile.mk
index 525e76c875..525e76c875 100644
--- a/src/mainboard/google/kahlee/variants/treeya/Makefile.inc
+++ b/src/mainboard/google/kahlee/variants/treeya/Makefile.mk
diff --git a/src/mainboard/google/kahlee/variants/treeya/spd/Makefile.inc b/src/mainboard/google/kahlee/variants/treeya/spd/Makefile.mk
index e72c9e6d7a..e72c9e6d7a 100644
--- a/src/mainboard/google/kahlee/variants/treeya/spd/Makefile.inc
+++ b/src/mainboard/google/kahlee/variants/treeya/spd/Makefile.mk
diff --git a/src/mainboard/google/kukui/Makefile.inc b/src/mainboard/google/kukui/Makefile.mk
index 7b0298d61e..7b0298d61e 100644
--- a/src/mainboard/google/kukui/Makefile.inc
+++ b/src/mainboard/google/kukui/Makefile.mk
diff --git a/src/mainboard/google/kukui/sdram_params/Makefile.inc b/src/mainboard/google/kukui/sdram_params/Makefile.mk
index e7fc110973..e7fc110973 100644
--- a/src/mainboard/google/kukui/sdram_params/Makefile.inc
+++ b/src/mainboard/google/kukui/sdram_params/Makefile.mk
diff --git a/src/mainboard/google/link/Makefile.inc b/src/mainboard/google/link/Makefile.mk
index 6b3f1b568c..6b3f1b568c 100644
--- a/src/mainboard/google/link/Makefile.inc
+++ b/src/mainboard/google/link/Makefile.mk
diff --git a/src/mainboard/google/mistral/Makefile.inc b/src/mainboard/google/mistral/Makefile.mk
index 1cbaa8b3fa..1cbaa8b3fa 100644
--- a/src/mainboard/google/mistral/Makefile.inc
+++ b/src/mainboard/google/mistral/Makefile.mk
diff --git a/src/mainboard/google/myst/Makefile.inc b/src/mainboard/google/myst/Makefile.mk
index 4c5f80db8b..305179e117 100644
--- a/src/mainboard/google/myst/Makefile.inc
+++ b/src/mainboard/google/myst/Makefile.mk
@@ -28,7 +28,7 @@ APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin
 # Add the below section back in after the apcbtool is updated to handle the
 # Phoenix APCB SPD configuration.
 
-ifneq ($(wildcard $(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/memory/Makefile.inc),)
+ifneq ($(wildcard $(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/memory/Makefile.mk),)
 
 LIB_SPD_DEPS = $(SPD_SOURCES)
 
diff --git a/src/mainboard/google/myst/variants/baseboard/Makefile.inc b/src/mainboard/google/myst/variants/baseboard/Makefile.mk
index 10b34e3379..10b34e3379 100644
--- a/src/mainboard/google/myst/variants/baseboard/Makefile.inc
+++ b/src/mainboard/google/myst/variants/baseboard/Makefile.mk
diff --git a/src/mainboard/google/myst/variants/myst/Makefile.inc b/src/mainboard/google/myst/variants/myst/Makefile.mk
index 88e75bde52..88e75bde52 100644
--- a/src/mainboard/google/myst/variants/myst/Makefile.inc
+++ b/src/mainboard/google/myst/variants/myst/Makefile.mk
diff --git a/src/mainboard/google/myst/variants/myst/memory/Makefile.inc b/src/mainboard/google/myst/variants/myst/memory/Makefile.mk
index 80510d7c0c..80510d7c0c 100644
--- a/src/mainboard/google/myst/variants/myst/memory/Makefile.inc
+++ b/src/mainboard/google/myst/variants/myst/memory/Makefile.mk
diff --git a/src/mainboard/google/nyan/Makefile.inc b/src/mainboard/google/nyan/Makefile.mk
index 190cfc5127..190cfc5127 100644
--- a/src/mainboard/google/nyan/Makefile.inc
+++ b/src/mainboard/google/nyan/Makefile.mk
diff --git a/src/mainboard/google/nyan/bct/Makefile.inc b/src/mainboard/google/nyan/bct/Makefile.mk
index 0c7b2b746a..0c7b2b746a 100644
--- a/src/mainboard/google/nyan/bct/Makefile.inc
+++ b/src/mainboard/google/nyan/bct/Makefile.mk
diff --git a/src/mainboard/google/nyan_big/Makefile.inc b/src/mainboard/google/nyan_big/Makefile.mk
index b734b5ba19..b734b5ba19 100644
--- a/src/mainboard/google/nyan_big/Makefile.inc
+++ b/src/mainboard/google/nyan_big/Makefile.mk
diff --git a/src/mainboard/google/nyan_big/bct/Makefile.inc b/src/mainboard/google/nyan_big/bct/Makefile.mk
index f83c93263d..f83c93263d 100644
--- a/src/mainboard/google/nyan_big/bct/Makefile.inc
+++ b/src/mainboard/google/nyan_big/bct/Makefile.mk
diff --git a/src/mainboard/google/nyan_blaze/Makefile.inc b/src/mainboard/google/nyan_blaze/Makefile.mk
index 54410f0812..54410f0812 100644
--- a/src/mainboard/google/nyan_blaze/Makefile.inc
+++ b/src/mainboard/google/nyan_blaze/Makefile.mk
diff --git a/src/mainboard/google/nyan_blaze/bct/Makefile.inc b/src/mainboard/google/nyan_blaze/bct/Makefile.mk
index 02f32a59bd..02f32a59bd 100644
--- a/src/mainboard/google/nyan_blaze/bct/Makefile.inc
+++ b/src/mainboard/google/nyan_blaze/bct/Makefile.mk