arch/x86: Use wildcard for mb/smihandler.c
Change-Id: I306f8cd74af62c0cd30f445d20c47f774f122481
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49247
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 2d3cda7..cfefec6 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -294,6 +294,4 @@
smm-y += memset.c
smm-$(CONFIG_X86_TOP4G_BOOTMEDIA_MAP) += mmap_boot.c
-ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/smihandler.c),)
-smm-srcs += src/mainboard/$(MAINBOARDDIR)/smihandler.c
-endif
+smm-srcs += $(wildcard src/mainboard/$(MAINBOARDDIR)/smihandler.c)
diff --git a/src/mainboard/dell/optiplex_9010/Makefile.inc b/src/mainboard/dell/optiplex_9010/Makefile.inc
index 7a8a684..964a7af 100644
--- a/src/mainboard/dell/optiplex_9010/Makefile.inc
+++ b/src/mainboard/dell/optiplex_9010/Makefile.inc
@@ -1,7 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
-smm-y += smihandler.c
-
bootblock-y += gpio.c
romstage-y += gpio.c
diff --git a/src/mainboard/google/auron/Makefile.inc b/src/mainboard/google/auron/Makefile.inc
index b8db4a0..f642243 100644
--- a/src/mainboard/google/auron/Makefile.inc
+++ b/src/mainboard/google/auron/Makefile.inc
@@ -6,8 +6,6 @@
ramstage-$(CONFIG_CHROMEOS) += chromeos.c
bootblock-$(CONFIG_CHROMEOS) += chromeos.c
-smm-y += smihandler.c
-
romstage-$(CONFIG_HAVE_SPD_IN_CBFS) += spd.c
romstage-y += variants/$(VARIANT_DIR)/pei_data.c
diff --git a/src/mainboard/google/beltino/Makefile.inc b/src/mainboard/google/beltino/Makefile.inc
index 8c5d6c5..e12aa15 100644
--- a/src/mainboard/google/beltino/Makefile.inc
+++ b/src/mainboard/google/beltino/Makefile.inc
@@ -7,7 +7,7 @@
verstage-$(CONFIG_VBOOT_SEPARATE_VERSTAGE) += chromeos.c
ramstage-y += lan.c
-smm-y += smihandler.c variants/$(VARIANT_DIR)/led.c
+smm-y += variants/$(VARIANT_DIR)/led.c
romstage-y += variants/$(VARIANT_DIR)/gpio.c
diff --git a/src/mainboard/google/brya/Makefile.inc b/src/mainboard/google/brya/Makefile.inc
index a186bfc..a7bc425 100644
--- a/src/mainboard/google/brya/Makefile.inc
+++ b/src/mainboard/google/brya/Makefile.inc
@@ -9,8 +9,6 @@
ramstage-y += mainboard.c
ramstage-y += ec.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
-
VARIANT_DIR:=$(call strip_quotes,$(CONFIG_VARIANT_DIR))
subdirs-y += variants/baseboard
diff --git a/src/mainboard/google/butterfly/Makefile.inc b/src/mainboard/google/butterfly/Makefile.inc
index 342c9f7..33a97f5 100644
--- a/src/mainboard/google/butterfly/Makefile.inc
+++ b/src/mainboard/google/butterfly/Makefile.inc
@@ -7,8 +7,6 @@
bootblock-y += gpio.c
romstage-y += gpio.c
-smm-y += mainboard_smi.c
-
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
bootblock-y += early_init.c
romstage-y += early_init.c
diff --git a/src/mainboard/google/butterfly/mainboard_smi.c b/src/mainboard/google/butterfly/smihandler.c
similarity index 100%
rename from src/mainboard/google/butterfly/mainboard_smi.c
rename to src/mainboard/google/butterfly/smihandler.c
diff --git a/src/mainboard/google/cyan/Makefile.inc b/src/mainboard/google/cyan/Makefile.inc
index 1ecc55e..4d10b66 100644
--- a/src/mainboard/google/cyan/Makefile.inc
+++ b/src/mainboard/google/cyan/Makefile.inc
@@ -10,8 +10,6 @@
ramstage-y += irqroute.c
ramstage-y += w25q64.c
-smm-y += smihandler.c
-
subdirs-y += variants/$(VARIANT_DIR)
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include
diff --git a/src/mainboard/google/dedede/Makefile.inc b/src/mainboard/google/dedede/Makefile.inc
index cd73bb0..1b5503d 100644
--- a/src/mainboard/google/dedede/Makefile.inc
+++ b/src/mainboard/google/dedede/Makefile.inc
@@ -10,8 +10,6 @@
ramstage-y += ec.c
ramstage-y += board_info.c
-smm-y += smihandler.c
-
VARIANT_DIR:=$(call strip_quotes,$(CONFIG_VARIANT_DIR))
subdirs-y += variants/baseboard
diff --git a/src/mainboard/google/deltaur/Makefile.inc b/src/mainboard/google/deltaur/Makefile.inc
index 5881615..8adb584 100644
--- a/src/mainboard/google/deltaur/Makefile.inc
+++ b/src/mainboard/google/deltaur/Makefile.inc
@@ -16,8 +16,6 @@
verstage-$(CONFIG_CHROMEOS) += chromeos.c
verstage-y += ec.c
-smm-y += smihandler.c
-
subdirs-y += variants/baseboard
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
diff --git a/src/mainboard/google/drallion/Makefile.inc b/src/mainboard/google/drallion/Makefile.inc
index 4c8b888..3c355c5 100644
--- a/src/mainboard/google/drallion/Makefile.inc
+++ b/src/mainboard/google/drallion/Makefile.inc
@@ -6,8 +6,6 @@
romstage-y += romstage.c
-smm-y += smihandler.c
-
bootblock-$(CONFIG_CHROMEOS) += chromeos.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c
romstage-$(CONFIG_CHROMEOS) += chromeos.c
diff --git a/src/mainboard/google/eve/Makefile.inc b/src/mainboard/google/eve/Makefile.inc
index ef8b0bd..fc6dc66 100644
--- a/src/mainboard/google/eve/Makefile.inc
+++ b/src/mainboard/google/eve/Makefile.inc
@@ -13,5 +13,3 @@
ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
-
-smm-y += smihandler.c
diff --git a/src/mainboard/google/fizz/Makefile.inc b/src/mainboard/google/fizz/Makefile.inc
index 13bf370..e192cff 100644
--- a/src/mainboard/google/fizz/Makefile.inc
+++ b/src/mainboard/google/fizz/Makefile.inc
@@ -13,8 +13,6 @@
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
-smm-y += smihandler.c
-
subdirs-y += variants/baseboard
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
diff --git a/src/mainboard/google/glados/Makefile.inc b/src/mainboard/google/glados/Makefile.inc
index 9bf6872..9fd41f8 100644
--- a/src/mainboard/google/glados/Makefile.inc
+++ b/src/mainboard/google/glados/Makefile.inc
@@ -15,8 +15,6 @@
ramstage-y += mainboard.c
-smm-y += smihandler.c
-
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
subdirs-y += variants/$(VARIANT_DIR)
diff --git a/src/mainboard/google/hatch/Makefile.inc b/src/mainboard/google/hatch/Makefile.inc
index f82325f..debe942 100644
--- a/src/mainboard/google/hatch/Makefile.inc
+++ b/src/mainboard/google/hatch/Makefile.inc
@@ -12,7 +12,6 @@
romstage-$(CONFIG_CHROMEOS) += chromeos.c
verstage-$(CONFIG_CHROMEOS) += chromeos.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 845fb0b..ed74d75 100644
--- a/src/mainboard/google/jecht/Makefile.inc
+++ b/src/mainboard/google/jecht/Makefile.inc
@@ -6,7 +6,7 @@
verstage-$(CONFIG_CHROMEOS) += chromeos.c
ramstage-y += lan.c
-smm-y += smihandler.c led.c
+smm-y += 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 faa2496..9470592 100644
--- a/src/mainboard/google/kahlee/Makefile.inc
+++ b/src/mainboard/google/kahlee/Makefile.inc
@@ -16,8 +16,6 @@
verstage-y += chromeos.c
verstage-y += ec.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 ee411c2..6b3f1b5 100644
--- a/src/mainboard/google/link/Makefile.inc
+++ b/src/mainboard/google/link/Makefile.inc
@@ -6,8 +6,6 @@
ramstage-y += chromeos.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
-smm-y += mainboard_smi.c
-
# Order of names in SPD_SOURCES is important!
SPD_SOURCES = elpida_4Gb_1600_x16
SPD_SOURCES += samsung_4Gb_1600_1.35v_x16
diff --git a/src/mainboard/google/link/mainboard_smi.c b/src/mainboard/google/link/smihandler.c
similarity index 100%
rename from src/mainboard/google/link/mainboard_smi.c
rename to src/mainboard/google/link/smihandler.c
diff --git a/src/mainboard/google/octopus/Makefile.inc b/src/mainboard/google/octopus/Makefile.inc
index aa05524..1acd8c6 100644
--- a/src/mainboard/google/octopus/Makefile.inc
+++ b/src/mainboard/google/octopus/Makefile.inc
@@ -8,7 +8,6 @@
ramstage-y += mainboard.c
verstage-$(CONFIG_CHROMEOS) += chromeos.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 3b54531..9f36e79 100644
--- a/src/mainboard/google/poppy/Makefile.inc
+++ b/src/mainboard/google/poppy/Makefile.inc
@@ -13,7 +13,6 @@
ramstage-y += ramstage.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
-smm-y += smihandler.c
smm-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
subdirs-y += variants/baseboard
diff --git a/src/mainboard/google/rambi/Makefile.inc b/src/mainboard/google/rambi/Makefile.inc
index da2e474..e0d5524 100644
--- a/src/mainboard/google/rambi/Makefile.inc
+++ b/src/mainboard/google/rambi/Makefile.inc
@@ -6,8 +6,6 @@
ramstage-y += irqroute.c
ramstage-y += w25q64.c
-smm-y += mainboard_smi.c
-
ramstage-y += variants/$(VARIANT_DIR)/gpio.c
ramstage-$(CONFIG_BOARD_GOOGLE_NINJA) += variants/$(VARIANT_DIR)/lan.c
diff --git a/src/mainboard/google/rambi/mainboard_smi.c b/src/mainboard/google/rambi/smihandler.c
similarity index 100%
rename from src/mainboard/google/rambi/mainboard_smi.c
rename to src/mainboard/google/rambi/smihandler.c
diff --git a/src/mainboard/google/reef/Makefile.inc b/src/mainboard/google/reef/Makefile.inc
index a115677..dd49610 100644
--- a/src/mainboard/google/reef/Makefile.inc
+++ b/src/mainboard/google/reef/Makefile.inc
@@ -8,7 +8,6 @@
ramstage-y += mainboard.c
verstage-$(CONFIG_CHROMEOS) += chromeos.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 e7bfc53..e7c23b1 100644
--- a/src/mainboard/google/sarien/Makefile.inc
+++ b/src/mainboard/google/sarien/Makefile.inc
@@ -8,8 +8,6 @@
romstage-y += romstage.c
-smm-y += smihandler.c
-
bootblock-$(CONFIG_CHROMEOS) += chromeos.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c
romstage-$(CONFIG_CHROMEOS) += chromeos.c
diff --git a/src/mainboard/google/slippy/Makefile.inc b/src/mainboard/google/slippy/Makefile.inc
index 8f75d72..2a2541d 100644
--- a/src/mainboard/google/slippy/Makefile.inc
+++ b/src/mainboard/google/slippy/Makefile.inc
@@ -5,8 +5,6 @@
romstage-$(CONFIG_CHROMEOS) += chromeos.c
ramstage-$(CONFIG_CHROMEOS) += chromeos.c
-smm-y += smihandler.c
-
romstage-y += variants/$(VARIANT_DIR)/gpio.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 5c196f0..a773a2d 100644
--- a/src/mainboard/google/stout/Makefile.inc
+++ b/src/mainboard/google/stout/Makefile.inc
@@ -5,7 +5,6 @@
romstage-y += chromeos.c
ramstage-y += chromeos.c
-smm-y += mainboard_smi.c
smm-y += ec.c
SRC_ROOT = $(src)/mainboard/google/stout
diff --git a/src/mainboard/google/stout/mainboard_smi.c b/src/mainboard/google/stout/smihandler.c
similarity index 100%
rename from src/mainboard/google/stout/mainboard_smi.c
rename to src/mainboard/google/stout/smihandler.c
diff --git a/src/mainboard/google/volteer/Makefile.inc b/src/mainboard/google/volteer/Makefile.inc
index c01f993..1847d56 100644
--- a/src/mainboard/google/volteer/Makefile.inc
+++ b/src/mainboard/google/volteer/Makefile.inc
@@ -11,8 +11,6 @@
ramstage-$(CONFIG_FW_CONFIG) += fw_config.c
ramstage-y += mainboard.c
-smm-y += smihandler.c
-
verstage-$(CONFIG_CHROMEOS) += chromeos.c
subdirs-y += variants/baseboard
diff --git a/src/mainboard/google/zork/Makefile.inc b/src/mainboard/google/zork/Makefile.inc
index 96c97b6..8a9d7af 100644
--- a/src/mainboard/google/zork/Makefile.inc
+++ b/src/mainboard/google/zork/Makefile.inc
@@ -11,8 +11,6 @@
verstage-y += verstage.c
-smm-y += smihandler.c
-
subdirs-y += variants/baseboard
subdirs-y += spd
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/Makefile.inc b/src/mainboard/hp/pavilion_m6_1035dx/Makefile.inc
index 77ae870..5d42eda 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/Makefile.inc
+++ b/src/mainboard/hp/pavilion_m6_1035dx/Makefile.inc
@@ -8,5 +8,3 @@
ramstage-y += BiosCallOuts.c
ramstage-y += OemCustomize.c
ramstage-y += ec.c
-
-smm-y += mainboard_smi.c
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/mainboard_smi.c b/src/mainboard/hp/pavilion_m6_1035dx/smihandler.c
similarity index 100%
rename from src/mainboard/hp/pavilion_m6_1035dx/mainboard_smi.c
rename to src/mainboard/hp/pavilion_m6_1035dx/smihandler.c
diff --git a/src/mainboard/intel/adlrvp/Makefile.inc b/src/mainboard/intel/adlrvp/Makefile.inc
index de92406..75c8cf8 100644
--- a/src/mainboard/intel/adlrvp/Makefile.inc
+++ b/src/mainboard/intel/adlrvp/Makefile.inc
@@ -13,8 +13,6 @@
romstage-y += board_id.c
romstage-y += memory.c
-smm-y += smihandler.c
-
ramstage-$(CONFIG_CHROMEOS) += chromeos.c
ramstage-y += ec.c
ramstage-y += mainboard.c
diff --git a/src/mainboard/intel/baskingridge/Makefile.inc b/src/mainboard/intel/baskingridge/Makefile.inc
index 46c9af2..9e60500 100644
--- a/src/mainboard/intel/baskingridge/Makefile.inc
+++ b/src/mainboard/intel/baskingridge/Makefile.inc
@@ -5,5 +5,3 @@
romstage-y += chromeos.c
ramstage-y += chromeos.c
verstage-$(CONFIG_VBOOT_SEPARATE_VERSTAGE) += chromeos.c
-
-smm-y += mainboard_smi.c
diff --git a/src/mainboard/intel/baskingridge/mainboard_smi.c b/src/mainboard/intel/baskingridge/smihandler.c
similarity index 100%
rename from src/mainboard/intel/baskingridge/mainboard_smi.c
rename to src/mainboard/intel/baskingridge/smihandler.c
diff --git a/src/mainboard/intel/dcp847ske/Makefile.inc b/src/mainboard/intel/dcp847ske/Makefile.inc
index 28bc7c7..08aa2dd 100644
--- a/src/mainboard/intel/dcp847ske/Makefile.inc
+++ b/src/mainboard/intel/dcp847ske/Makefile.inc
@@ -3,4 +3,3 @@
bootblock-y += gpio.c
romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
-smm-y += smihandler.c
diff --git a/src/mainboard/intel/glkrvp/Makefile.inc b/src/mainboard/intel/glkrvp/Makefile.inc
index ea5b2c6..37b60d0 100644
--- a/src/mainboard/intel/glkrvp/Makefile.inc
+++ b/src/mainboard/intel/glkrvp/Makefile.inc
@@ -10,7 +10,6 @@
ramstage-y += mainboard.c
verstage-$(CONFIG_CHROMEOS) += chromeos.c
-smm-y += smihandler.c
subdirs-y += variants/baseboard
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
diff --git a/src/mainboard/intel/jasperlake_rvp/Makefile.inc b/src/mainboard/intel/jasperlake_rvp/Makefile.inc
index 2ac1b07..c680b23 100644
--- a/src/mainboard/intel/jasperlake_rvp/Makefile.inc
+++ b/src/mainboard/intel/jasperlake_rvp/Makefile.inc
@@ -15,8 +15,6 @@
ramstage-y += mainboard.c
ramstage-y += board_id.c
-smm-y += smihandler.c
-
subdirs-y += variants/baseboard
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include
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 c168b6d..80821eb 100644
--- a/src/mainboard/intel/kblrvp/Makefile.inc
+++ b/src/mainboard/intel/kblrvp/Makefile.inc
@@ -19,7 +19,5 @@
ramstage-y += hda_verb.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 63c39cf..f7ea681 100644
--- a/src/mainboard/intel/kunimitsu/Makefile.inc
+++ b/src/mainboard/intel/kunimitsu/Makefile.inc
@@ -13,5 +13,3 @@
ramstage-y += mainboard.c
ramstage-y += ramstage.c
-
-smm-y += smihandler.c
diff --git a/src/mainboard/intel/strago/Makefile.inc b/src/mainboard/intel/strago/Makefile.inc
index bf35b66..21ae380 100644
--- a/src/mainboard/intel/strago/Makefile.inc
+++ b/src/mainboard/intel/strago/Makefile.inc
@@ -10,5 +10,3 @@
ramstage-y += irqroute.c
ramstage-y += ramstage.c
ramstage-y += w25q64.c
-
-smm-y += smihandler.c
diff --git a/src/mainboard/intel/tglrvp/Makefile.inc b/src/mainboard/intel/tglrvp/Makefile.inc
index 2ca32f3..93c9c49 100644
--- a/src/mainboard/intel/tglrvp/Makefile.inc
+++ b/src/mainboard/intel/tglrvp/Makefile.inc
@@ -11,8 +11,6 @@
romstage-y += romstage_fsp_params.c
romstage-y += board_id.c
-smm-y += smihandler.c
-
ramstage-$(CONFIG_CHROMEOS) += chromeos.c
ramstage-y += ec.c
ramstage-y += mainboard.c
diff --git a/src/mainboard/lenovo/g505s/Makefile.inc b/src/mainboard/lenovo/g505s/Makefile.inc
index 77ae870..5d42eda 100644
--- a/src/mainboard/lenovo/g505s/Makefile.inc
+++ b/src/mainboard/lenovo/g505s/Makefile.inc
@@ -8,5 +8,3 @@
ramstage-y += BiosCallOuts.c
ramstage-y += OemCustomize.c
ramstage-y += ec.c
-
-smm-y += mainboard_smi.c
diff --git a/src/mainboard/lenovo/g505s/mainboard_smi.c b/src/mainboard/lenovo/g505s/smihandler.c
similarity index 100%
rename from src/mainboard/lenovo/g505s/mainboard_smi.c
rename to src/mainboard/lenovo/g505s/smihandler.c
diff --git a/src/mainboard/lenovo/l520/Makefile.inc b/src/mainboard/lenovo/l520/Makefile.inc
index 0126a75..e4b6fbf 100644
--- a/src/mainboard/lenovo/l520/Makefile.inc
+++ b/src/mainboard/lenovo/l520/Makefile.inc
@@ -2,7 +2,6 @@
bootblock-y += gpio.c
romstage-y += gpio.c
-smm-y += smihandler.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
bootblock-y += early_init.c
diff --git a/src/mainboard/lenovo/s230u/Makefile.inc b/src/mainboard/lenovo/s230u/Makefile.inc
index 12e7709..31bb642 100644
--- a/src/mainboard/lenovo/s230u/Makefile.inc
+++ b/src/mainboard/lenovo/s230u/Makefile.inc
@@ -1,7 +1,6 @@
bootblock-y += gpio.c
romstage-y += gpio.c
ramstage-y += ec.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/t410/Makefile.inc b/src/mainboard/lenovo/t410/Makefile.inc
index 20ec760..3b410c4 100644
--- a/src/mainboard/lenovo/t410/Makefile.inc
+++ b/src/mainboard/lenovo/t410/Makefile.inc
@@ -3,7 +3,6 @@
bootblock-y += early_init.c
smm-y += dock.c
-smm-y += smihandler.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
romstage-y += dock.c
diff --git a/src/mainboard/lenovo/t420/Makefile.inc b/src/mainboard/lenovo/t420/Makefile.inc
index 991eadb..e4b6fbf 100644
--- a/src/mainboard/lenovo/t420/Makefile.inc
+++ b/src/mainboard/lenovo/t420/Makefile.inc
@@ -1,6 +1,5 @@
## SPDX-License-Identifier: GPL-2.0-only
-smm-y += smihandler.c
bootblock-y += gpio.c
romstage-y += gpio.c
diff --git a/src/mainboard/lenovo/t420s/Makefile.inc b/src/mainboard/lenovo/t420s/Makefile.inc
index 991eadb..e4b6fbf 100644
--- a/src/mainboard/lenovo/t420s/Makefile.inc
+++ b/src/mainboard/lenovo/t420s/Makefile.inc
@@ -1,6 +1,5 @@
## SPDX-License-Identifier: GPL-2.0-only
-smm-y += smihandler.c
bootblock-y += gpio.c
romstage-y += gpio.c
diff --git a/src/mainboard/lenovo/t430/Makefile.inc b/src/mainboard/lenovo/t430/Makefile.inc
index 0f49600..e402ffa 100644
--- a/src/mainboard/lenovo/t430/Makefile.inc
+++ b/src/mainboard/lenovo/t430/Makefile.inc
@@ -1,6 +1,5 @@
bootblock-y += gpio.c
romstage-y += gpio.c
-smm-y += smihandler.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
bootblock-y += early_init.c
diff --git a/src/mainboard/lenovo/t430s/Makefile.inc b/src/mainboard/lenovo/t430s/Makefile.inc
index 196a098..43a2a92 100644
--- a/src/mainboard/lenovo/t430s/Makefile.inc
+++ b/src/mainboard/lenovo/t430s/Makefile.inc
@@ -1,6 +1,5 @@
## SPDX-License-Identifier: GPL-2.0-only
-smm-y += smihandler.c
bootblock-y += variants/$(VARIANT_DIR)/gpio.c
romstage-y += variants/$(VARIANT_DIR)/gpio.c
romstage-y += variants/$(VARIANT_DIR)/romstage.c
diff --git a/src/mainboard/lenovo/t440p/Makefile.inc b/src/mainboard/lenovo/t440p/Makefile.inc
index fa6e7af..ebe01ae 100644
--- a/src/mainboard/lenovo/t440p/Makefile.inc
+++ b/src/mainboard/lenovo/t440p/Makefile.inc
@@ -1,3 +1,2 @@
romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
-smm-y += smihandler.c
diff --git a/src/mainboard/lenovo/t520/Makefile.inc b/src/mainboard/lenovo/t520/Makefile.inc
index ab5aa4d..a3b838b 100644
--- a/src/mainboard/lenovo/t520/Makefile.inc
+++ b/src/mainboard/lenovo/t520/Makefile.inc
@@ -1,6 +1,5 @@
## SPDX-License-Identifier: GPL-2.0-only
-smm-y += smihandler.c
bootblock-y += variants/$(VARIANT_DIR)/gpio.c
romstage-y += variants/$(VARIANT_DIR)/gpio.c
romstage-y += variants/$(VARIANT_DIR)/romstage.c
diff --git a/src/mainboard/lenovo/t530/Makefile.inc b/src/mainboard/lenovo/t530/Makefile.inc
index ab5aa4d..a3b838b 100644
--- a/src/mainboard/lenovo/t530/Makefile.inc
+++ b/src/mainboard/lenovo/t530/Makefile.inc
@@ -1,6 +1,5 @@
## SPDX-License-Identifier: GPL-2.0-only
-smm-y += smihandler.c
bootblock-y += variants/$(VARIANT_DIR)/gpio.c
romstage-y += variants/$(VARIANT_DIR)/gpio.c
romstage-y += variants/$(VARIANT_DIR)/romstage.c
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc b/src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc
index e9e74dd..ea3bd28 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc
+++ b/src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc
@@ -2,7 +2,6 @@
subdirs-y += spd
-smm-y += smihandler.c
bootblock-y += gpio.c
romstage-y += gpio.c
diff --git a/src/mainboard/lenovo/x201/Makefile.inc b/src/mainboard/lenovo/x201/Makefile.inc
index 80e513c..d185f5c 100644
--- a/src/mainboard/lenovo/x201/Makefile.inc
+++ b/src/mainboard/lenovo/x201/Makefile.inc
@@ -3,7 +3,6 @@
bootblock-y += early_init.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 d870c4d..b104bb5 100644
--- a/src/mainboard/lenovo/x220/Makefile.inc
+++ b/src/mainboard/lenovo/x220/Makefile.inc
@@ -1,6 +1,5 @@
## SPDX-License-Identifier: GPL-2.0-only
-smm-y += smihandler.c
bootblock-y += variants/$(VARIANT_DIR)/gpio.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 5316d24..8e801f1 100644
--- a/src/mainboard/lenovo/x230/Makefile.inc
+++ b/src/mainboard/lenovo/x230/Makefile.inc
@@ -1,6 +1,5 @@
## SPDX-License-Identifier: GPL-2.0-only
-smm-y += smihandler.c
bootblock-y += variants/$(VARIANT_DIR)/early_init.c
bootblock-y += variants/$(VARIANT_DIR)/gpio.c
romstage-y += variants/$(VARIANT_DIR)/early_init.c
diff --git a/src/mainboard/packardbell/ms2290/Makefile.inc b/src/mainboard/packardbell/ms2290/Makefile.inc
index 9b1ea08..86b9433 100644
--- a/src/mainboard/packardbell/ms2290/Makefile.inc
+++ b/src/mainboard/packardbell/ms2290/Makefile.inc
@@ -1,6 +1,5 @@
## SPDX-License-Identifier: GPL-2.0-only
-smm-y += smihandler.c
romstage-y += gpio.c
ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads