From 16fa339d8424facdef521dee8ba6f1ad9e047b8a Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Mon, 6 Dec 2021 12:21:33 +0100 Subject: [PATCH] cpu/x86/Makefile.inc: Build smi_trigger on !HAVE_SMI_HANDLER MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/59913 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Kyösti Mälkki Reviewed-by: HAOUAS Elyes --- src/cpu/x86/Makefile.inc | 3 +++ src/cpu/x86/{smm => }/smi_trigger.c | 0 src/cpu/x86/smm/Makefile.inc | 2 -- 3 files changed, 3 insertions(+), 2 deletions(-) rename src/cpu/x86/{smm => }/smi_trigger.c (100%) diff --git a/src/cpu/x86/Makefile.inc b/src/cpu/x86/Makefile.inc index b9f6417a22..b9705286f8 100644 --- a/src/cpu/x86/Makefile.inc +++ b/src/cpu/x86/Makefile.inc @@ -8,7 +8,10 @@ all-$(CONFIG_ARCH_ALL_STAGES_X86_64) += 64bit/mode_switch.S 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 4d1cdf86ee..36aa113443 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 @@ ramstage-srcs += $(obj)/cpu/x86/smm/smm.manual endif smm-y += save_state.c -smm-y += smi_trigger.c ifeq ($(CONFIG_SMM_TSEG),y)