summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/auron/Makefile.inc2
-rw-r--r--src/mainboard/google/beltino/Makefile.inc2
-rw-r--r--src/mainboard/google/butterfly/Makefile.inc2
-rw-r--r--src/mainboard/google/cyan/Makefile.inc2
-rw-r--r--src/mainboard/google/dragonegg/Makefile.inc2
-rw-r--r--src/mainboard/google/eve/Makefile.inc2
-rw-r--r--src/mainboard/google/fizz/Makefile.inc2
-rw-r--r--src/mainboard/google/fizz/variants/karma/Makefile.inc2
-rw-r--r--src/mainboard/google/glados/Makefile.inc2
-rw-r--r--src/mainboard/google/glados/variants/caroline/Makefile.inc2
-rw-r--r--src/mainboard/google/glados/variants/cave/Makefile.inc2
-rw-r--r--src/mainboard/google/glados/variants/chell/Makefile.inc2
-rw-r--r--src/mainboard/google/glados/variants/glados/Makefile.inc2
-rw-r--r--src/mainboard/google/hatch/Makefile.inc2
-rw-r--r--src/mainboard/google/jecht/Makefile.inc2
-rw-r--r--src/mainboard/google/kahlee/Makefile.inc2
-rw-r--r--src/mainboard/google/link/Makefile.inc2
-rw-r--r--src/mainboard/google/octopus/Makefile.inc2
-rw-r--r--src/mainboard/google/poppy/Makefile.inc2
-rw-r--r--src/mainboard/google/poppy/variants/nami/Makefile.inc2
-rw-r--r--src/mainboard/google/poppy/variants/nautilus/Makefile.inc4
-rw-r--r--src/mainboard/google/poppy/variants/nocturne/Makefile.inc2
-rw-r--r--src/mainboard/google/rambi/Makefile.inc2
-rw-r--r--src/mainboard/google/reef/Makefile.inc2
-rw-r--r--src/mainboard/google/sarien/Makefile.inc2
-rw-r--r--src/mainboard/google/slippy/Makefile.inc2
-rw-r--r--src/mainboard/google/stout/Makefile.inc4
-rw-r--r--src/mainboard/hp/pavilion_m6_1035dx/Makefile.inc2
-rw-r--r--src/mainboard/intel/baskingridge/Makefile.inc2
-rw-r--r--src/mainboard/intel/cannonlake_rvp/Makefile.inc2
-rw-r--r--src/mainboard/intel/dcp847ske/Makefile.inc2
-rw-r--r--src/mainboard/intel/glkrvp/Makefile.inc2
-rw-r--r--src/mainboard/intel/kblrvp/Makefile.inc2
-rw-r--r--src/mainboard/intel/kunimitsu/Makefile.inc2
-rw-r--r--src/mainboard/intel/strago/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/g505s/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/l520/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/s230u/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/t420/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/t420s/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/t430/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/t430s/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/t520/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/t530/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/t60/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/x201/Makefile.inc4
-rw-r--r--src/mainboard/lenovo/x220/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/x230/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/x60/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/z61t/Makefile.inc2
-rw-r--r--src/mainboard/packardbell/ms2290/Makefile.inc2
-rw-r--r--src/mainboard/scaleway/tagada/Makefile.inc2
53 files changed, 56 insertions, 56 deletions
diff --git a/src/mainboard/google/auron/Makefile.inc b/src/mainboard/google/auron/Makefile.inc
index d2b6d0eb9a..6b1de0536c 100644
--- a/src/mainboard/google/auron/Makefile.inc
+++ b/src/mainboard/google/auron/Makefile.inc
@@ -19,7 +19,7 @@ romstage-$(CONFIG_CHROMEOS) += chromeos.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c
bootblock-$(CONFIG_CHROMEOS) += chromeos.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
romstage-y += variants/$(VARIANT_DIR)/pei_data.c
ramstage-y += variants/$(VARIANT_DIR)/pei_data.c
diff --git a/src/mainboard/google/beltino/Makefile.inc b/src/mainboard/google/beltino/Makefile.inc
index bb90e9780b..e1bebc1369 100644
--- a/src/mainboard/google/beltino/Makefile.inc
+++ b/src/mainboard/google/beltino/Makefile.inc
@@ -18,7 +18,7 @@ ramstage-$(CONFIG_CHROMEOS) += chromeos.c
verstage-$(CONFIG_VBOOT_SEPARATE_VERSTAGE) += chromeos.c
ramstage-y += lan.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c variants/$(VARIANT_DIR)/led.c
+smm-y += smihandler.c variants/$(VARIANT_DIR)/led.c
romstage-y += variants/$(VARIANT_DIR)/led.c
diff --git a/src/mainboard/google/butterfly/Makefile.inc b/src/mainboard/google/butterfly/Makefile.inc
index 8033e1c325..b6654b8c0a 100644
--- a/src/mainboard/google/butterfly/Makefile.inc
+++ b/src/mainboard/google/butterfly/Makefile.inc
@@ -19,6 +19,6 @@ romstage-y += chromeos.c
ramstage-y += chromeos.c
romstage-y += gpio.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c
+smm-y += mainboard_smi.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
diff --git a/src/mainboard/google/cyan/Makefile.inc b/src/mainboard/google/cyan/Makefile.inc
index 027c49cc8f..86198a61dc 100644
--- a/src/mainboard/google/cyan/Makefile.inc
+++ b/src/mainboard/google/cyan/Makefile.inc
@@ -24,7 +24,7 @@ ramstage-y += ec.c
ramstage-y += irqroute.c
ramstage-y += w25q64.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
subdirs-y += variants/$(VARIANT_DIR)
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
diff --git a/src/mainboard/google/dragonegg/Makefile.inc b/src/mainboard/google/dragonegg/Makefile.inc
index 39e94d0119..dcd8cbccbc 100644
--- a/src/mainboard/google/dragonegg/Makefile.inc
+++ b/src/mainboard/google/dragonegg/Makefile.inc
@@ -26,7 +26,7 @@ ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
ramstage-y += mainboard.c
ramstage-y += ramstage.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
subdirs-y += variants/baseboard
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
diff --git a/src/mainboard/google/eve/Makefile.inc b/src/mainboard/google/eve/Makefile.inc
index c96e23ea49..d853404a45 100644
--- a/src/mainboard/google/eve/Makefile.inc
+++ b/src/mainboard/google/eve/Makefile.inc
@@ -26,4 +26,4 @@ ramstage-y += mainboard.c
ramstage-y += ramstage.c
ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
diff --git a/src/mainboard/google/fizz/Makefile.inc b/src/mainboard/google/fizz/Makefile.inc
index 59f84b543a..5514090d4e 100644
--- a/src/mainboard/google/fizz/Makefile.inc
+++ b/src/mainboard/google/fizz/Makefile.inc
@@ -25,7 +25,7 @@ ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
ramstage-y += mainboard.c
ramstage-y += ramstage.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
subdirs-y += variants/baseboard
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
diff --git a/src/mainboard/google/fizz/variants/karma/Makefile.inc b/src/mainboard/google/fizz/variants/karma/Makefile.inc
index 747552267d..ec115e4655 100644
--- a/src/mainboard/google/fizz/variants/karma/Makefile.inc
+++ b/src/mainboard/google/fizz/variants/karma/Makefile.inc
@@ -3,4 +3,4 @@ bootblock-y += gpio.c
ramstage-y += gpio.c
ramstage-y += nhlt.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
diff --git a/src/mainboard/google/glados/Makefile.inc b/src/mainboard/google/glados/Makefile.inc
index ccfeb8506f..da9de29521 100644
--- a/src/mainboard/google/glados/Makefile.inc
+++ b/src/mainboard/google/glados/Makefile.inc
@@ -29,7 +29,7 @@ ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
ramstage-y += mainboard.c
ramstage-y += ramstage.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
subdirs-y += variants/$(VARIANT_DIR)
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
diff --git a/src/mainboard/google/glados/variants/caroline/Makefile.inc b/src/mainboard/google/glados/variants/caroline/Makefile.inc
index 73d7090953..21b20e6912 100644
--- a/src/mainboard/google/glados/variants/caroline/Makefile.inc
+++ b/src/mainboard/google/glados/variants/caroline/Makefile.inc
@@ -16,7 +16,7 @@
romstage-y += variant.c
ramstage-y += variant.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += variant.c
+smm-y += variant.c
SPD_BIN = $(obj)/spd.bin
diff --git a/src/mainboard/google/glados/variants/cave/Makefile.inc b/src/mainboard/google/glados/variants/cave/Makefile.inc
index 5d95e348af..f3b52c2398 100644
--- a/src/mainboard/google/glados/variants/cave/Makefile.inc
+++ b/src/mainboard/google/glados/variants/cave/Makefile.inc
@@ -16,7 +16,7 @@
romstage-y += variant.c
ramstage-y += variant.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += variant.c
+smm-y += variant.c
SPD_BIN = $(obj)/spd.bin
diff --git a/src/mainboard/google/glados/variants/chell/Makefile.inc b/src/mainboard/google/glados/variants/chell/Makefile.inc
index 2eff4b1f1d..986bdd8552 100644
--- a/src/mainboard/google/glados/variants/chell/Makefile.inc
+++ b/src/mainboard/google/glados/variants/chell/Makefile.inc
@@ -16,7 +16,7 @@
romstage-y += variant.c
ramstage-y += variant.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += variant.c
+smm-y += variant.c
SPD_BIN = $(obj)/spd.bin
diff --git a/src/mainboard/google/glados/variants/glados/Makefile.inc b/src/mainboard/google/glados/variants/glados/Makefile.inc
index 82dbcade42..b6dbbd4562 100644
--- a/src/mainboard/google/glados/variants/glados/Makefile.inc
+++ b/src/mainboard/google/glados/variants/glados/Makefile.inc
@@ -16,7 +16,7 @@
romstage-y += variant.c
ramstage-y += variant.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += variant.c
+smm-y += variant.c
SPD_BIN = $(obj)/spd.bin
diff --git a/src/mainboard/google/hatch/Makefile.inc b/src/mainboard/google/hatch/Makefile.inc
index 3f35f8266e..01a1eb85dd 100644
--- a/src/mainboard/google/hatch/Makefile.inc
+++ b/src/mainboard/google/hatch/Makefile.inc
@@ -24,7 +24,7 @@ romstage-y += romstage.c
romstage-$(CONFIG_CHROMEOS) += chromeos.c
verstage-$(CONFIG_CHROMEOS) += chromeos.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
subdirs-y += variants/baseboard
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
diff --git a/src/mainboard/google/jecht/Makefile.inc b/src/mainboard/google/jecht/Makefile.inc
index 116792fab7..9ea24f6aa0 100644
--- a/src/mainboard/google/jecht/Makefile.inc
+++ b/src/mainboard/google/jecht/Makefile.inc
@@ -19,7 +19,7 @@ ramstage-$(CONFIG_CHROMEOS) += chromeos.c
verstage-$(CONFIG_CHROMEOS) += chromeos.c
ramstage-y += lan.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c led.c
+smm-y += smihandler.c led.c
romstage-y += variants/$(VARIANT_DIR)/pei_data.c
ramstage-y += variants/$(VARIANT_DIR)/pei_data.c
diff --git a/src/mainboard/google/kahlee/Makefile.inc b/src/mainboard/google/kahlee/Makefile.inc
index 770a999eca..0abd8840ec 100644
--- a/src/mainboard/google/kahlee/Makefile.inc
+++ b/src/mainboard/google/kahlee/Makefile.inc
@@ -29,7 +29,7 @@ ramstage-y += OemCustomize.c
verstage-y += chromeos.c
verstage-y += ec.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
subdirs-y += variants/baseboard
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
diff --git a/src/mainboard/google/link/Makefile.inc b/src/mainboard/google/link/Makefile.inc
index 89bb365023..e6c7be181c 100644
--- a/src/mainboard/google/link/Makefile.inc
+++ b/src/mainboard/google/link/Makefile.inc
@@ -19,7 +19,7 @@ romstage-y += chromeos.c
ramstage-y += chromeos.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
-smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c
+smm-y += mainboard_smi.c
SPD_BIN = $(obj)/spd.bin
# Order of names in SPD_SOURCES is important!
diff --git a/src/mainboard/google/octopus/Makefile.inc b/src/mainboard/google/octopus/Makefile.inc
index 1a9adbcd8c..aa055246d2 100644
--- a/src/mainboard/google/octopus/Makefile.inc
+++ b/src/mainboard/google/octopus/Makefile.inc
@@ -8,7 +8,7 @@ ramstage-y += ec.c
ramstage-y += mainboard.c
verstage-$(CONFIG_CHROMEOS) += chromeos.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
subdirs-y += variants/baseboard
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
diff --git a/src/mainboard/google/poppy/Makefile.inc b/src/mainboard/google/poppy/Makefile.inc
index 86754e62eb..030cf1da2d 100644
--- a/src/mainboard/google/poppy/Makefile.inc
+++ b/src/mainboard/google/poppy/Makefile.inc
@@ -25,7 +25,7 @@ ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
ramstage-y += mainboard.c
ramstage-y += ramstage.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
smm-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
subdirs-y += variants/baseboard
diff --git a/src/mainboard/google/poppy/variants/nami/Makefile.inc b/src/mainboard/google/poppy/variants/nami/Makefile.inc
index 0033c60ee7..7c1e4808a6 100644
--- a/src/mainboard/google/poppy/variants/nami/Makefile.inc
+++ b/src/mainboard/google/poppy/variants/nami/Makefile.inc
@@ -35,7 +35,7 @@ ramstage-y += gpio.c
ramstage-y += nhlt.c
ramstage-y += mainboard.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
# Add OEM ID table
cbfs-files-y += oem.bin
diff --git a/src/mainboard/google/poppy/variants/nautilus/Makefile.inc b/src/mainboard/google/poppy/variants/nautilus/Makefile.inc
index c71520601a..3a36b83bda 100644
--- a/src/mainboard/google/poppy/variants/nautilus/Makefile.inc
+++ b/src/mainboard/google/poppy/variants/nautilus/Makefile.inc
@@ -14,5 +14,5 @@ ramstage-y += nhlt.c
ramstage-y += mainboard.c
ramstage-y += sku.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += sku.c
+smm-y += smihandler.c
+smm-y += sku.c
diff --git a/src/mainboard/google/poppy/variants/nocturne/Makefile.inc b/src/mainboard/google/poppy/variants/nocturne/Makefile.inc
index 260d9c0bf3..371655a94e 100644
--- a/src/mainboard/google/poppy/variants/nocturne/Makefile.inc
+++ b/src/mainboard/google/poppy/variants/nocturne/Makefile.inc
@@ -22,4 +22,4 @@ ramstage-y += nhlt.c
ramstage-y += mainboard.c
ramstage-y += ec.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += ec.c
+smm-y += ec.c
diff --git a/src/mainboard/google/rambi/Makefile.inc b/src/mainboard/google/rambi/Makefile.inc
index 7c0fb35abf..0e80b64252 100644
--- a/src/mainboard/google/rambi/Makefile.inc
+++ b/src/mainboard/google/rambi/Makefile.inc
@@ -19,7 +19,7 @@ ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
ramstage-y += irqroute.c
ramstage-y += w25q64.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c
+smm-y += mainboard_smi.c
ramstage-y += variants/$(VARIANT_DIR)/gpio.c
diff --git a/src/mainboard/google/reef/Makefile.inc b/src/mainboard/google/reef/Makefile.inc
index 3701a91344..a115677773 100644
--- a/src/mainboard/google/reef/Makefile.inc
+++ b/src/mainboard/google/reef/Makefile.inc
@@ -8,7 +8,7 @@ ramstage-y += ec.c
ramstage-y += mainboard.c
verstage-$(CONFIG_CHROMEOS) += chromeos.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
subdirs-y += variants/baseboard
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
diff --git a/src/mainboard/google/sarien/Makefile.inc b/src/mainboard/google/sarien/Makefile.inc
index 7c37bc9901..7e230447aa 100644
--- a/src/mainboard/google/sarien/Makefile.inc
+++ b/src/mainboard/google/sarien/Makefile.inc
@@ -20,7 +20,7 @@ ramstage-y += sku.c
romstage-y += romstage.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
bootblock-$(CONFIG_CHROMEOS) += chromeos.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c
diff --git a/src/mainboard/google/slippy/Makefile.inc b/src/mainboard/google/slippy/Makefile.inc
index 53e8dffd85..921f9e7585 100644
--- a/src/mainboard/google/slippy/Makefile.inc
+++ b/src/mainboard/google/slippy/Makefile.inc
@@ -18,7 +18,7 @@ ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
romstage-$(CONFIG_CHROMEOS) += chromeos.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
romstage-y += variants/$(VARIANT_DIR)/romstage.c
diff --git a/src/mainboard/google/stout/Makefile.inc b/src/mainboard/google/stout/Makefile.inc
index be1f0fe91f..f4f2284de4 100644
--- a/src/mainboard/google/stout/Makefile.inc
+++ b/src/mainboard/google/stout/Makefile.inc
@@ -18,8 +18,8 @@ ramstage-y += ec.c
romstage-y += chromeos.c
ramstage-y += chromeos.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += ec.c
+smm-y += mainboard_smi.c
+smm-y += ec.c
SRC_ROOT = $(src)/mainboard/google/stout
romstage-y += gpio.c
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/Makefile.inc b/src/mainboard/hp/pavilion_m6_1035dx/Makefile.inc
index 80dd0d2785..f030989b36 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/Makefile.inc
+++ b/src/mainboard/hp/pavilion_m6_1035dx/Makefile.inc
@@ -22,4 +22,4 @@ ramstage-y += BiosCallOuts.c
ramstage-y += OemCustomize.c
ramstage-y += ec.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c
+smm-y += mainboard_smi.c
diff --git a/src/mainboard/intel/baskingridge/Makefile.inc b/src/mainboard/intel/baskingridge/Makefile.inc
index 06e86c1d6c..e34704d79d 100644
--- a/src/mainboard/intel/baskingridge/Makefile.inc
+++ b/src/mainboard/intel/baskingridge/Makefile.inc
@@ -17,4 +17,4 @@ romstage-y += chromeos.c
ramstage-y += chromeos.c
verstage-$(CONFIG_VBOOT_SEPARATE_VERSTAGE) += chromeos.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c
+smm-y += mainboard_smi.c
diff --git a/src/mainboard/intel/cannonlake_rvp/Makefile.inc b/src/mainboard/intel/cannonlake_rvp/Makefile.inc
index c18fd9b34d..d98477118d 100644
--- a/src/mainboard/intel/cannonlake_rvp/Makefile.inc
+++ b/src/mainboard/intel/cannonlake_rvp/Makefile.inc
@@ -27,7 +27,7 @@ romstage-y += romstage_fsp_params.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c
ramstage-y += mainboard.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
subdirs-y += variants/baseboard
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
diff --git a/src/mainboard/intel/dcp847ske/Makefile.inc b/src/mainboard/intel/dcp847ske/Makefile.inc
index 4d516f6204..96bac06a0a 100644
--- a/src/mainboard/intel/dcp847ske/Makefile.inc
+++ b/src/mainboard/intel/dcp847ske/Makefile.inc
@@ -1,4 +1,4 @@
romstage-y += early_southbridge.c
romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
diff --git a/src/mainboard/intel/glkrvp/Makefile.inc b/src/mainboard/intel/glkrvp/Makefile.inc
index f2da3794d5..ea5b2c65c6 100644
--- a/src/mainboard/intel/glkrvp/Makefile.inc
+++ b/src/mainboard/intel/glkrvp/Makefile.inc
@@ -10,7 +10,7 @@ ramstage-y += ec.c
ramstage-y += mainboard.c
verstage-$(CONFIG_CHROMEOS) += chromeos.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
subdirs-y += variants/baseboard
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
diff --git a/src/mainboard/intel/kblrvp/Makefile.inc b/src/mainboard/intel/kblrvp/Makefile.inc
index 6da41ae02f..ffed7a257d 100644
--- a/src/mainboard/intel/kblrvp/Makefile.inc
+++ b/src/mainboard/intel/kblrvp/Makefile.inc
@@ -33,7 +33,7 @@ ramstage-y += ramstage.c
ramstage-y += hda_verb.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
subdirs-y += variants/$(VARIANT_DIR)
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include
diff --git a/src/mainboard/intel/kunimitsu/Makefile.inc b/src/mainboard/intel/kunimitsu/Makefile.inc
index 3330a0aab8..933074b4c5 100644
--- a/src/mainboard/intel/kunimitsu/Makefile.inc
+++ b/src/mainboard/intel/kunimitsu/Makefile.inc
@@ -28,7 +28,7 @@ ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
ramstage-y += mainboard.c
ramstage-y += ramstage.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
ifeq ($(CONFIG_PLATFORM_USES_FSP2_0),y)
romstage-srcs := $(subst $(MAINBOARDDIR)/romstage.c,$(MAINBOARDDIR)/romstage_fsp20.c,$(romstage-srcs))
diff --git a/src/mainboard/intel/strago/Makefile.inc b/src/mainboard/intel/strago/Makefile.inc
index e6f0c9e652..3f88b3d64e 100644
--- a/src/mainboard/intel/strago/Makefile.inc
+++ b/src/mainboard/intel/strago/Makefile.inc
@@ -25,4 +25,4 @@ ramstage-y += irqroute.c
ramstage-y += ramstage.c
ramstage-y += w25q64.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
diff --git a/src/mainboard/lenovo/g505s/Makefile.inc b/src/mainboard/lenovo/g505s/Makefile.inc
index 80dd0d2785..f030989b36 100644
--- a/src/mainboard/lenovo/g505s/Makefile.inc
+++ b/src/mainboard/lenovo/g505s/Makefile.inc
@@ -22,4 +22,4 @@ ramstage-y += BiosCallOuts.c
ramstage-y += OemCustomize.c
ramstage-y += ec.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c
+smm-y += mainboard_smi.c
diff --git a/src/mainboard/lenovo/l520/Makefile.inc b/src/mainboard/lenovo/l520/Makefile.inc
index 2aa7f0f6c9..2ce116f90c 100644
--- a/src/mainboard/lenovo/l520/Makefile.inc
+++ b/src/mainboard/lenovo/l520/Makefile.inc
@@ -15,6 +15,6 @@
romstage-y += romstage.c
romstage-y += gpio.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
diff --git a/src/mainboard/lenovo/s230u/Makefile.inc b/src/mainboard/lenovo/s230u/Makefile.inc
index dea2e4e582..88626a275a 100644
--- a/src/mainboard/lenovo/s230u/Makefile.inc
+++ b/src/mainboard/lenovo/s230u/Makefile.inc
@@ -1,6 +1,6 @@
romstage-y += gpio.c
ramstage-y += ec.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
# FIXME: SPD images for samsung_8gb and hynix_8gb are missing.
# It's possible that no mainboards with that variation were manufactured.
diff --git a/src/mainboard/lenovo/t420/Makefile.inc b/src/mainboard/lenovo/t420/Makefile.inc
index 2dab9507f1..30cf715194 100644
--- a/src/mainboard/lenovo/t420/Makefile.inc
+++ b/src/mainboard/lenovo/t420/Makefile.inc
@@ -13,7 +13,7 @@
## GNU General Public License for more details.
##
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
diff --git a/src/mainboard/lenovo/t420s/Makefile.inc b/src/mainboard/lenovo/t420s/Makefile.inc
index 2dab9507f1..30cf715194 100644
--- a/src/mainboard/lenovo/t420s/Makefile.inc
+++ b/src/mainboard/lenovo/t420s/Makefile.inc
@@ -13,7 +13,7 @@
## GNU General Public License for more details.
##
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
diff --git a/src/mainboard/lenovo/t430/Makefile.inc b/src/mainboard/lenovo/t430/Makefile.inc
index ada25f7136..558ab0a966 100644
--- a/src/mainboard/lenovo/t430/Makefile.inc
+++ b/src/mainboard/lenovo/t430/Makefile.inc
@@ -1,5 +1,5 @@
romstage-y += romstage.c
romstage-y += gpio.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
diff --git a/src/mainboard/lenovo/t430s/Makefile.inc b/src/mainboard/lenovo/t430s/Makefile.inc
index d70c22e6e3..4008f5ab07 100644
--- a/src/mainboard/lenovo/t430s/Makefile.inc
+++ b/src/mainboard/lenovo/t430s/Makefile.inc
@@ -13,7 +13,7 @@
## GNU General Public License for more details.
##
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
romstage-y += variants/$(VARIANT_DIR)/gpio.c
romstage-y += variants/$(VARIANT_DIR)/romstage.c
ramstage-y += variants/$(VARIANT_DIR)/hda_verb.c
diff --git a/src/mainboard/lenovo/t520/Makefile.inc b/src/mainboard/lenovo/t520/Makefile.inc
index 7187013da4..ee4669c055 100644
--- a/src/mainboard/lenovo/t520/Makefile.inc
+++ b/src/mainboard/lenovo/t520/Makefile.inc
@@ -13,7 +13,7 @@
## GNU General Public License for more details.
##
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
romstage-y += variants/$(VARIANT_DIR)/gpio.c
romstage-y += variants/$(VARIANT_DIR)/romstage.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
diff --git a/src/mainboard/lenovo/t530/Makefile.inc b/src/mainboard/lenovo/t530/Makefile.inc
index 7187013da4..ee4669c055 100644
--- a/src/mainboard/lenovo/t530/Makefile.inc
+++ b/src/mainboard/lenovo/t530/Makefile.inc
@@ -13,7 +13,7 @@
## GNU General Public License for more details.
##
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
romstage-y += variants/$(VARIANT_DIR)/gpio.c
romstage-y += variants/$(VARIANT_DIR)/romstage.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
diff --git a/src/mainboard/lenovo/t60/Makefile.inc b/src/mainboard/lenovo/t60/Makefile.inc
index 8473a13505..f646af8fd5 100644
--- a/src/mainboard/lenovo/t60/Makefile.inc
+++ b/src/mainboard/lenovo/t60/Makefile.inc
@@ -13,6 +13,6 @@
## GNU General Public License for more details.
##
-smm-$(CONFIG_HAVE_SMI_HANDLER) += dock.c
+smm-y += dock.c
romstage-y += dock.c
romstage-y += gpio.c
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc b/src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc
index ee08d78642..63b41a49a2 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc
+++ b/src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc
@@ -15,7 +15,7 @@
subdirs-y += spd
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
diff --git a/src/mainboard/lenovo/x201/Makefile.inc b/src/mainboard/lenovo/x201/Makefile.inc
index f7ff93b626..f97235612e 100644
--- a/src/mainboard/lenovo/x201/Makefile.inc
+++ b/src/mainboard/lenovo/x201/Makefile.inc
@@ -13,8 +13,8 @@
## GNU General Public License for more details.
##
-smm-$(CONFIG_HAVE_SMI_HANDLER) += dock.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += dock.c
+smm-y += smihandler.c
romstage-y += dock.c
ramstage-y += dock.c
romstage-y += gpio.c
diff --git a/src/mainboard/lenovo/x220/Makefile.inc b/src/mainboard/lenovo/x220/Makefile.inc
index 2c52c21d33..a1cbc4cea5 100644
--- a/src/mainboard/lenovo/x220/Makefile.inc
+++ b/src/mainboard/lenovo/x220/Makefile.inc
@@ -13,7 +13,7 @@
## GNU General Public License for more details.
##
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
romstage-y += variants/$(VARIANT_DIR)/gpio.c
romstage-y += variants/$(VARIANT_DIR)/romstage.c
diff --git a/src/mainboard/lenovo/x230/Makefile.inc b/src/mainboard/lenovo/x230/Makefile.inc
index 2dab9507f1..30cf715194 100644
--- a/src/mainboard/lenovo/x230/Makefile.inc
+++ b/src/mainboard/lenovo/x230/Makefile.inc
@@ -13,7 +13,7 @@
## GNU General Public License for more details.
##
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
diff --git a/src/mainboard/lenovo/x60/Makefile.inc b/src/mainboard/lenovo/x60/Makefile.inc
index 4b17ea8e6c..a7ad539a1f 100644
--- a/src/mainboard/lenovo/x60/Makefile.inc
+++ b/src/mainboard/lenovo/x60/Makefile.inc
@@ -13,7 +13,7 @@
## GNU General Public License for more details.
##
-smm-$(CONFIG_HAVE_SMI_HANDLER) += dock.c
+smm-y += dock.c
romstage-y += dock.c
ramstage-y += dock.c
romstage-y += gpio.c
diff --git a/src/mainboard/lenovo/z61t/Makefile.inc b/src/mainboard/lenovo/z61t/Makefile.inc
index 8473a13505..f646af8fd5 100644
--- a/src/mainboard/lenovo/z61t/Makefile.inc
+++ b/src/mainboard/lenovo/z61t/Makefile.inc
@@ -13,6 +13,6 @@
## GNU General Public License for more details.
##
-smm-$(CONFIG_HAVE_SMI_HANDLER) += dock.c
+smm-y += dock.c
romstage-y += dock.c
romstage-y += gpio.c
diff --git a/src/mainboard/packardbell/ms2290/Makefile.inc b/src/mainboard/packardbell/ms2290/Makefile.inc
index da1f50d115..b23d2e5560 100644
--- a/src/mainboard/packardbell/ms2290/Makefile.inc
+++ b/src/mainboard/packardbell/ms2290/Makefile.inc
@@ -13,6 +13,6 @@
## GNU General Public License for more details.
##
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
+smm-y += smihandler.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
diff --git a/src/mainboard/scaleway/tagada/Makefile.inc b/src/mainboard/scaleway/tagada/Makefile.inc
index c33e993c30..8370c8aaac 100644
--- a/src/mainboard/scaleway/tagada/Makefile.inc
+++ b/src/mainboard/scaleway/tagada/Makefile.inc
@@ -26,6 +26,6 @@ bootblock-y += bmcinfo.c
postcar-y += bmcinfo.c
romstage-y += bmcinfo.c
ramstage-y += bmcinfo.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += bmcinfo.c
+smm-y += bmcinfo.c
CPPFLAGS_common += -Isrc/mainboard/$(MAINBOARDDIR)/