Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/59913 )
Change subject: cpu/x86/Makefile.inc: Build smi_trigger on !HAVE_SMI_HANDLER ......................................................................
cpu/x86/Makefile.inc: Build smi_trigger on !HAVE_SMI_HANDLER
A lot of soc code requires a definition of apm_control, which smm/smi_trigger.c provided for !HAVE_SMI_HANDLER, but is not added as a build target.
Fixes building Q35 without smihandler.
Change-Id: Ie57819b3d169311371a1caca83c9b0c796b46048 Signed-off-by: Arthur Heymans arthur@aheymans.xyz Reviewed-on: https://review.coreboot.org/c/coreboot/+/59913 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com Reviewed-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-by: HAOUAS Elyes ehaouas@noos.fr --- M src/cpu/x86/Makefile.inc R src/cpu/x86/smi_trigger.c M src/cpu/x86/smm/Makefile.inc 3 files changed, 3 insertions(+), 2 deletions(-)
Approvals: build bot (Jenkins): Verified Kyösti Mälkki: Looks good to me, but someone else must approve HAOUAS Elyes: Looks good to me, but someone else must approve Angel Pons: Looks good to me, approved
diff --git a/src/cpu/x86/Makefile.inc b/src/cpu/x86/Makefile.inc index b9f6417..b970528 100644 --- a/src/cpu/x86/Makefile.inc +++ b/src/cpu/x86/Makefile.inc @@ -8,7 +8,10 @@
subdirs-$(CONFIG_PARALLEL_MP) += name ramstage-$(CONFIG_PARALLEL_MP) += mp_init.c + ramstage-y += backup_default_smm.c +ramstage-y += smi_trigger.c +smm-y += smi_trigger.c
subdirs-$(CONFIG_CPU_INTEL_COMMON_SMM) += ../intel/smm
diff --git a/src/cpu/x86/smm/smi_trigger.c b/src/cpu/x86/smi_trigger.c similarity index 100% rename from src/cpu/x86/smm/smi_trigger.c rename to src/cpu/x86/smi_trigger.c diff --git a/src/cpu/x86/smm/Makefile.inc b/src/cpu/x86/smm/Makefile.inc index 4d1cdf8..36aa113 100644 --- a/src/cpu/x86/smm/Makefile.inc +++ b/src/cpu/x86/smm/Makefile.inc @@ -1,7 +1,6 @@ ## SPDX-License-Identifier: GPL-2.0-only
ramstage-y += smm_module_loader.c -ramstage-y += smi_trigger.c
ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32),y) $(eval $(call create_class_compiler,smm,x86_32)) @@ -29,7 +28,6 @@ endif
smm-y += save_state.c -smm-y += smi_trigger.c
ifeq ($(CONFIG_SMM_TSEG),y)