From e882269c1110726eea6da7205b61cc65270b8aeb Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Sun, 23 May 2021 12:40:09 +0200 Subject: [PATCH] qemu-q35,xeon_sp: Drop HAVE_SMI_HANDLER conditional with smm-class MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Build of the entire smm-class is skipped if we have HAVE_SMI_HANDLER=n. Change-Id: I64bdcb28a996609111861ebafe172493b0650354 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/54852 Reviewed-by: Arthur Heymans Reviewed-by: Kyösti Mälkki Reviewed-by: Rocky Phagura Tested-by: build bot (Jenkins) --- src/mainboard/emulation/qemu-q35/Makefile.inc | 4 ++-- src/soc/intel/xeon_sp/Makefile.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mainboard/emulation/qemu-q35/Makefile.inc b/src/mainboard/emulation/qemu-q35/Makefile.inc index 9179e9e424..6d5c29e7fd 100644 --- a/src/mainboard/emulation/qemu-q35/Makefile.inc +++ b/src/mainboard/emulation/qemu-q35/Makefile.inc @@ -20,5 +20,5 @@ verstage-$(CONFIG_CHROMEOS) += chromeos.c verstage-$(CONFIG_CHROMEOS) += ../qemu-i440fx/fw_cfg.c ramstage-$(CONFIG_CHROMEOS) += chromeos.c -smm-$(CONFIG_HAVE_SMI_HANDLER) += smi.c -smm-$(CONFIG_HAVE_SMI_HANDLER) += memmap.c +smm-y += smi.c +smm-y += memmap.c diff --git a/src/soc/intel/xeon_sp/Makefile.inc b/src/soc/intel/xeon_sp/Makefile.inc index 16a18ec456..89e43fcc8b 100644 --- a/src/soc/intel/xeon_sp/Makefile.inc +++ b/src/soc/intel/xeon_sp/Makefile.inc @@ -13,7 +13,7 @@ ramstage-y += memmap.c pch.c lockdown.c finalize.c ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_PMC) += pmc.c pmutil.c ramstage-$(CONFIG_HAVE_ACPI_TABLES) += nb_acpi.c acpi.c ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smmrelocate.c -smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c pmutil.c +smm-y += smihandler.c pmutil.c postcar-y += spi.c CPPFLAGS_common += -I$(src)/soc/intel/xeon_sp/include