summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/arch/x86/Makefile.inc4
-rw-r--r--src/mainboard/dell/optiplex_9010/Makefile.inc2
-rw-r--r--src/mainboard/google/auron/Makefile.inc2
-rw-r--r--src/mainboard/google/beltino/Makefile.inc2
-rw-r--r--src/mainboard/google/brya/Makefile.inc2
-rw-r--r--src/mainboard/google/butterfly/Makefile.inc2
-rw-r--r--src/mainboard/google/butterfly/smihandler.c (renamed from src/mainboard/google/butterfly/mainboard_smi.c)0
-rw-r--r--src/mainboard/google/cyan/Makefile.inc2
-rw-r--r--src/mainboard/google/dedede/Makefile.inc2
-rw-r--r--src/mainboard/google/deltaur/Makefile.inc2
-rw-r--r--src/mainboard/google/drallion/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/glados/Makefile.inc2
-rw-r--r--src/mainboard/google/hatch/Makefile.inc1
-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/link/smihandler.c (renamed from src/mainboard/google/link/mainboard_smi.c)0
-rw-r--r--src/mainboard/google/octopus/Makefile.inc1
-rw-r--r--src/mainboard/google/poppy/Makefile.inc1
-rw-r--r--src/mainboard/google/rambi/Makefile.inc2
-rw-r--r--src/mainboard/google/rambi/smihandler.c (renamed from src/mainboard/google/rambi/mainboard_smi.c)0
-rw-r--r--src/mainboard/google/reef/Makefile.inc1
-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.inc1
-rw-r--r--src/mainboard/google/stout/smihandler.c (renamed from src/mainboard/google/stout/mainboard_smi.c)0
-rw-r--r--src/mainboard/google/volteer/Makefile.inc2
-rw-r--r--src/mainboard/google/zork/Makefile.inc2
-rw-r--r--src/mainboard/hp/pavilion_m6_1035dx/Makefile.inc2
-rw-r--r--src/mainboard/hp/pavilion_m6_1035dx/smihandler.c (renamed from src/mainboard/hp/pavilion_m6_1035dx/mainboard_smi.c)0
-rw-r--r--src/mainboard/intel/adlrvp/Makefile.inc2
-rw-r--r--src/mainboard/intel/baskingridge/Makefile.inc2
-rw-r--r--src/mainboard/intel/baskingridge/smihandler.c (renamed from src/mainboard/intel/baskingridge/mainboard_smi.c)0
-rw-r--r--src/mainboard/intel/dcp847ske/Makefile.inc1
-rw-r--r--src/mainboard/intel/glkrvp/Makefile.inc1
-rw-r--r--src/mainboard/intel/jasperlake_rvp/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/intel/tglrvp/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/g505s/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/g505s/smihandler.c (renamed from src/mainboard/lenovo/g505s/mainboard_smi.c)0
-rw-r--r--src/mainboard/lenovo/l520/Makefile.inc1
-rw-r--r--src/mainboard/lenovo/s230u/Makefile.inc1
-rw-r--r--src/mainboard/lenovo/t410/Makefile.inc1
-rw-r--r--src/mainboard/lenovo/t420/Makefile.inc1
-rw-r--r--src/mainboard/lenovo/t420s/Makefile.inc1
-rw-r--r--src/mainboard/lenovo/t430/Makefile.inc1
-rw-r--r--src/mainboard/lenovo/t430s/Makefile.inc1
-rw-r--r--src/mainboard/lenovo/t440p/Makefile.inc1
-rw-r--r--src/mainboard/lenovo/t520/Makefile.inc1
-rw-r--r--src/mainboard/lenovo/t530/Makefile.inc1
-rw-r--r--src/mainboard/lenovo/x1_carbon_gen1/Makefile.inc1
-rw-r--r--src/mainboard/lenovo/x201/Makefile.inc1
-rw-r--r--src/mainboard/lenovo/x220/Makefile.inc1
-rw-r--r--src/mainboard/lenovo/x230/Makefile.inc1
-rw-r--r--src/mainboard/packardbell/ms2290/Makefile.inc1
59 files changed, 3 insertions, 81 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 2d3cda7e7864..cfefec605f2d 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -294,6 +294,4 @@ smm-y += memmove.c
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 7a8a68423a83..964a7af97aff 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 b8db4a0d2092..f642243667fb 100644
--- a/src/mainboard/google/auron/Makefile.inc
+++ b/src/mainboard/google/auron/Makefile.inc
@@ -6,8 +6,6 @@ romstage-$(CONFIG_CHROMEOS) += chromeos.c
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 8c5d6c5eb9ea..e12aa15e6954 100644
--- a/src/mainboard/google/beltino/Makefile.inc
+++ b/src/mainboard/google/beltino/Makefile.inc
@@ -7,7 +7,7 @@ ramstage-$(CONFIG_CHROMEOS) += chromeos.c
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 a186bfc32437..a7bc42587c1e 100644
--- a/src/mainboard/google/brya/Makefile.inc
+++ b/src/mainboard/google/brya/Makefile.inc
@@ -9,8 +9,6 @@ ramstage-$(CONFIG_CHROMEOS) += chromeos.c
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 342c9f7dde3b..33a97f5e078b 100644
--- a/src/mainboard/google/butterfly/Makefile.inc
+++ b/src/mainboard/google/butterfly/Makefile.inc
@@ -7,8 +7,6 @@ ramstage-y += chromeos.c
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
index 1f45055b0e3a..1f45055b0e3a 100644
--- a/src/mainboard/google/butterfly/mainboard_smi.c
+++ b/src/mainboard/google/butterfly/smihandler.c
diff --git a/src/mainboard/google/cyan/Makefile.inc b/src/mainboard/google/cyan/Makefile.inc
index 1ecc55e69778..4d10b660a07c 100644
--- a/src/mainboard/google/cyan/Makefile.inc
+++ b/src/mainboard/google/cyan/Makefile.inc
@@ -10,8 +10,6 @@ ramstage-y += ec.c
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 cd73bb08a196..1b5503d40f48 100644
--- a/src/mainboard/google/dedede/Makefile.inc
+++ b/src/mainboard/google/dedede/Makefile.inc
@@ -10,8 +10,6 @@ ramstage-y += mainboard.c
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 5881615cc64b..8adb5845990b 100644
--- a/src/mainboard/google/deltaur/Makefile.inc
+++ b/src/mainboard/google/deltaur/Makefile.inc
@@ -16,8 +16,6 @@ ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_HDA_VERB) += hda_verb.c
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 4c8b888aad5c..3c355c5a2ec0 100644
--- a/src/mainboard/google/drallion/Makefile.inc
+++ b/src/mainboard/google/drallion/Makefile.inc
@@ -6,8 +6,6 @@ ramstage-y += ramstage.c
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 ef8b0bd110a0..fc6dc660f183 100644
--- a/src/mainboard/google/eve/Makefile.inc
+++ b/src/mainboard/google/eve/Makefile.inc
@@ -13,5 +13,3 @@ ramstage-y += mainboard.c
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 13bf370c403b..e192cffd3dad 100644
--- a/src/mainboard/google/fizz/Makefile.inc
+++ b/src/mainboard/google/fizz/Makefile.inc
@@ -13,8 +13,6 @@ ramstage-y += mainboard.c
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 9bf68727de2e..9fd41f89a7af 100644
--- a/src/mainboard/google/glados/Makefile.inc
+++ b/src/mainboard/google/glados/Makefile.inc
@@ -15,8 +15,6 @@ ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
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 f82325f177dd..debe94295f31 100644
--- a/src/mainboard/google/hatch/Makefile.inc
+++ b/src/mainboard/google/hatch/Makefile.inc
@@ -12,7 +12,6 @@ romstage-$(CONFIG_ROMSTAGE_SPD_SMBUS) += romstage_spd_smbus.c
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 845fb0bd2ced..ed74d751095a 100644
--- a/src/mainboard/google/jecht/Makefile.inc
+++ b/src/mainboard/google/jecht/Makefile.inc
@@ -6,7 +6,7 @@ ramstage-$(CONFIG_CHROMEOS) += chromeos.c
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 faa2496a19dd..94705922a6eb 100644
--- a/src/mainboard/google/kahlee/Makefile.inc
+++ b/src/mainboard/google/kahlee/Makefile.inc
@@ -16,8 +16,6 @@ ramstage-y += OemCustomize.c
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 ee411c2f28e9..6b3f1b568cb8 100644
--- a/src/mainboard/google/link/Makefile.inc
+++ b/src/mainboard/google/link/Makefile.inc
@@ -6,8 +6,6 @@ romstage-y += chromeos.c
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
index 8d4b4bd5af22..8d4b4bd5af22 100644
--- a/src/mainboard/google/link/mainboard_smi.c
+++ b/src/mainboard/google/link/smihandler.c
diff --git a/src/mainboard/google/octopus/Makefile.inc b/src/mainboard/google/octopus/Makefile.inc
index aa055246d276..1acd8c688e46 100644
--- a/src/mainboard/google/octopus/Makefile.inc
+++ b/src/mainboard/google/octopus/Makefile.inc
@@ -8,7 +8,6 @@ ramstage-y += ec.c
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 3b5453162590..9f36e794633f 100644
--- a/src/mainboard/google/poppy/Makefile.inc
+++ b/src/mainboard/google/poppy/Makefile.inc
@@ -13,7 +13,6 @@ ramstage-y += mainboard.c
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 da2e4746145d..e0d552476eb8 100644
--- a/src/mainboard/google/rambi/Makefile.inc
+++ b/src/mainboard/google/rambi/Makefile.inc
@@ -6,8 +6,6 @@ ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
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
index c434860ea572..c434860ea572 100644
--- a/src/mainboard/google/rambi/mainboard_smi.c
+++ b/src/mainboard/google/rambi/smihandler.c
diff --git a/src/mainboard/google/reef/Makefile.inc b/src/mainboard/google/reef/Makefile.inc
index a115677773b8..dd49610f89cc 100644
--- a/src/mainboard/google/reef/Makefile.inc
+++ b/src/mainboard/google/reef/Makefile.inc
@@ -8,7 +8,6 @@ ramstage-y += ec.c
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 e7bfc53aa09f..e7c23b108bd9 100644
--- a/src/mainboard/google/sarien/Makefile.inc
+++ b/src/mainboard/google/sarien/Makefile.inc
@@ -8,8 +8,6 @@ ramstage-y += sku.c
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 8f75d72b15dc..2a2541d477ec 100644
--- a/src/mainboard/google/slippy/Makefile.inc
+++ b/src/mainboard/google/slippy/Makefile.inc
@@ -5,8 +5,6 @@ ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
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 5c196f07f086..a773a2d7ddcf 100644
--- a/src/mainboard/google/stout/Makefile.inc
+++ b/src/mainboard/google/stout/Makefile.inc
@@ -5,7 +5,6 @@ ramstage-y += ec.c
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
index d282bc7f2377..d282bc7f2377 100644
--- a/src/mainboard/google/stout/mainboard_smi.c
+++ b/src/mainboard/google/stout/smihandler.c
diff --git a/src/mainboard/google/volteer/Makefile.inc b/src/mainboard/google/volteer/Makefile.inc
index c01f993d026b..1847d56b6a18 100644
--- a/src/mainboard/google/volteer/Makefile.inc
+++ b/src/mainboard/google/volteer/Makefile.inc
@@ -11,8 +11,6 @@ ramstage-y += ec.c
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 96c97b68d384..8a9d7af89afe 100644
--- a/src/mainboard/google/zork/Makefile.inc
+++ b/src/mainboard/google/zork/Makefile.inc
@@ -11,8 +11,6 @@ ramstage-y += sku_id.c
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 77ae870b6c55..5d42edabf4ec 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 += buildOpts.c
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
index fa81b280ee42..fa81b280ee42 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/mainboard_smi.c
+++ b/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 de924067d1a6..75c8cf8e2099 100644
--- a/src/mainboard/intel/adlrvp/Makefile.inc
+++ b/src/mainboard/intel/adlrvp/Makefile.inc
@@ -13,8 +13,6 @@ romstage-y += romstage_fsp_params.c
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 46c9af28b7ea..9e605009dac7 100644
--- a/src/mainboard/intel/baskingridge/Makefile.inc
+++ b/src/mainboard/intel/baskingridge/Makefile.inc
@@ -5,5 +5,3 @@ romstage-y += gpio.c
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
index 59a3c044f5a5..59a3c044f5a5 100644
--- a/src/mainboard/intel/baskingridge/mainboard_smi.c
+++ b/src/mainboard/intel/baskingridge/smihandler.c
diff --git a/src/mainboard/intel/dcp847ske/Makefile.inc b/src/mainboard/intel/dcp847ske/Makefile.inc
index 28bc7c7cc9f0..08aa2ddde796 100644
--- a/src/mainboard/intel/dcp847ske/Makefile.inc
+++ b/src/mainboard/intel/dcp847ske/Makefile.inc
@@ -3,4 +3,3 @@ romstage-y += early_southbridge.c
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 ea5b2c65c648..37b60d0fae4f 100644
--- a/src/mainboard/intel/glkrvp/Makefile.inc
+++ b/src/mainboard/intel/glkrvp/Makefile.inc
@@ -10,7 +10,6 @@ ramstage-y += ec.c
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 2ac1b07befbb..c680b23b5bf2 100644
--- a/src/mainboard/intel/jasperlake_rvp/Makefile.inc
+++ b/src/mainboard/intel/jasperlake_rvp/Makefile.inc
@@ -15,8 +15,6 @@ ramstage-$(CONFIG_CHROMEOS) += chromeos.c
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 c168b6dbf365..80821eb64571 100644
--- a/src/mainboard/intel/kblrvp/Makefile.inc
+++ b/src/mainboard/intel/kblrvp/Makefile.inc
@@ -19,7 +19,5 @@ ramstage-y += ramstage.c
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 63c39cf5e718..f7ea681fb9ba 100644
--- a/src/mainboard/intel/kunimitsu/Makefile.inc
+++ b/src/mainboard/intel/kunimitsu/Makefile.inc
@@ -13,5 +13,3 @@ ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
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 bf35b669a871..21ae380e4b39 100644
--- a/src/mainboard/intel/strago/Makefile.inc
+++ b/src/mainboard/intel/strago/Makefile.inc
@@ -10,5 +10,3 @@ ramstage-$(CONFIG_MAINBOARD_HAS_CHROMEOS) += gpio.c
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 2ca32f376035..93c9c493e054 100644
--- a/src/mainboard/intel/tglrvp/Makefile.inc
+++ b/src/mainboard/intel/tglrvp/Makefile.inc
@@ -11,8 +11,6 @@ romstage-$(CONFIG_CHROMEOS) += chromeos.c
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 77ae870b6c55..5d42edabf4ec 100644
--- a/src/mainboard/lenovo/g505s/Makefile.inc
+++ b/src/mainboard/lenovo/g505s/Makefile.inc
@@ -8,5 +8,3 @@ ramstage-y += buildOpts.c
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
index fa81b280ee42..fa81b280ee42 100644
--- a/src/mainboard/lenovo/g505s/mainboard_smi.c
+++ b/src/mainboard/lenovo/g505s/smihandler.c
diff --git a/src/mainboard/lenovo/l520/Makefile.inc b/src/mainboard/lenovo/l520/Makefile.inc
index 0126a75fa045..e4b6fbf0f0a5 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 12e77097e4db..31bb642edf51 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 20ec7604c9ac..3b410c48587a 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 991eadbff2be..e4b6fbf0f0a5 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 991eadbff2be..e4b6fbf0f0a5 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 0f49600c7d19..e402ffa605ce 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 196a0981f672..43a2a9230178 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 fa6e7af2025b..ebe01aea99c1 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 ab5aa4de91bd..a3b838ba10c1 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 ab5aa4de91bd..a3b838ba10c1 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 e9e74ddf3fe5..ea3bd287b59e 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 80e513cd7231..d185f5cbe543 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 d870c4dd198e..b104bb52a98b 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 5316d24d880b..8e801f145dd8 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 9b1ea087bddc..86b9433353e5 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