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>

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)

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
 

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

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
 

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

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

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

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

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
 

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

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

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
 

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)

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

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

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
 

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

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

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

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

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

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

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
 

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

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

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
 

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

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

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

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

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

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

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

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

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

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

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

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

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.

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

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
 

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
 

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

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

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

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

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

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
 

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

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

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

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