[coreboot-gerrit] Change in ...coreboot[master]: Makefile.inc: Compile smm files independent ARCH_RAMSTAGE_X86_32/64

[Subrata Banik (Code Review)]

Subrata Banik has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/33115 )

Change subject: Makefile.inc: Compile smm files independent ARCH_RAMSTAGE_X86_32/64
......................................................................

Makefile.inc: Compile smm files independent ARCH_RAMSTAGE_X86_32/64

This patch makes smm related files compile independent of
ramstage getting compiled.

If user selects RAMPAYLOAD to boot without ramstage, there
will be need for smm code to get compiled independently.

Change-Id: I17a3eb80a4d5ef86e0319357c01b6bf5b90ef15b
Signed-off-by: Subrata Banik 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33115
Reviewed-by: Aaron Durbin 
Tested-by: build bot (Jenkins) 
---
M src/arch/x86/Makefile.inc
1 file changed, 13 insertions(+), 12 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Aaron Durbin: Looks good to me, approved

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 7e518d8..025b933 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -336,13 +336,6 @@
 ramstage-$(CONFIG_COLLECT_TIMESTAMPS_TSC) += timestamp.c
 ramstage-$(CONFIG_HAVE_ACPI_RESUME) += wakeup.S

-smm-$(CONFIG_IDT_IN_EVERY_STAGE) += exception.c
-smm-$(CONFIG_IDT_IN_EVERY_STAGE) += idt.S
-smm-y += memcpy.c
-smm-y += memmove.c
-smm-y += memset.c
-smm-$(CONFIG_X86_TOP4G_BOOTMEDIA_MAP) += mmap_boot.c
-
 ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32),y)
 rmodules_x86_32-y += memcpy.c
 rmodules_x86_32-y += memmove.c
@@ -379,11 +372,6 @@
 ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/fadt.c
 endif
 endif # CONFIG_GENERATE_ACPI_TABLES
-ifeq ($(CONFIG_HAVE_SMI_HANDLER),y)
-ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/smihandler.c),)
-smm-srcs += src/mainboard/$(MAINBOARDDIR)/smihandler.c
-endif
-endif

ramstage-libs ?=

@@ -408,3 +396,16 @@
 endif

endif # CONFIG_ARCH_RAMSTAGE_X86_32 / CONFIG_ARCH_RAMSTAGE_X86_64
+
+smm-$(CONFIG_IDT_IN_EVERY_STAGE) += exception.c
+smm-$(CONFIG_IDT_IN_EVERY_STAGE) += idt.S
+smm-y += memcpy.c
+smm-y += memmove.c
+smm-y += memset.c
+smm-$(CONFIG_X86_TOP4G_BOOTMEDIA_MAP) += mmap_boot.c
+
+ifeq ($(CONFIG_HAVE_SMI_HANDLER),y)
+ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/smihandler.c),)
+smm-srcs += src/mainboard/$(MAINBOARDDIR)/smihandler.c
+endif
+endif