aboutsummaryrefslogtreecommitdiff
path: root/src/arch/x86/lib/Makefile.inc
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/x86/lib/Makefile.inc')
-rw-r--r--src/arch/x86/lib/Makefile.inc14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/arch/x86/lib/Makefile.inc b/src/arch/x86/lib/Makefile.inc
index 0d88a6daea..1b111d8c17 100644
--- a/src/arch/x86/lib/Makefile.inc
+++ b/src/arch/x86/lib/Makefile.inc
@@ -1,5 +1,5 @@
-ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32),y)
+ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32)$(CONFIG_ARCH_ROMSTAGE_X86_64),y)
romstage-y += cbfs_and_run.c
romstage-y += memset.c
@@ -7,9 +7,9 @@ romstage-y += memcpy.c
romstage-y += memmove.c
romstage-y += mmap_boot.c
-endif # CONFIG_ARCH_ROMSTAGE_X86_32
+endif # CONFIG_ARCH_ROMSTAGE_X86_32 / CONFIG_ARCH_ROMSTAGE_X86_64
-ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32),y)
+ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32)$(CONFIG_ARCH_RAMSTAGE_X86_64),y)
ramstage-y += c_start.S
ramstage-y += cpu.c
@@ -33,8 +33,14 @@ smm-y += memcpy.c
smm-y += memmove.c
smm-y += mmap_boot.c
+ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32),y)
rmodules_x86_32-y += memset.c
rmodules_x86_32-y += memcpy.c
rmodules_x86_32-y += memmove.c
+else
+rmodules_x86_64-y += memset.c
+rmodules_x86_64-y += memcpy.c
+rmodules_x86_64-y += memmove.c
+endif
-endif # CONFIG_ARCH_RAMSTAGE_X86_32
+endif # CONFIG_ARCH_RAMSTAGE_X86_32 / CONFIG_ARCH_RAMSTAGE_X86_64