From e4e0f9477f97e88e8ecaa7c4ffd31083ed1d327d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Fri, 29 May 2015 10:55:02 +0300 Subject: [PATCH] x86 SMM: We have single SMM linker script now MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I0c20b674b536a2964962f84228f681b53dc114dc Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/10366 Reviewed-by: Vladimir Serbinenko Tested-by: build bot (Jenkins) --- src/cpu/x86/smm/Makefile.inc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/cpu/x86/smm/Makefile.inc b/src/cpu/x86/smm/Makefile.inc index 60b0388386..d04ec0bc1e 100644 --- a/src/cpu/x86/smm/Makefile.inc +++ b/src/cpu/x86/smm/Makefile.inc @@ -81,8 +81,8 @@ endif else # CONFIG_SMM_TSEG -$(obj)/cpu/x86/smm/smm_wrap: $(obj)/cpu/x86/smm/smm.o $(src)/cpu/x86/smm/$(SMM_LDSCRIPT) - $(LD_smm) $(SMM_LDFLAGS) -nostdlib -nostartfiles --gc-sections -static -o $(obj)/cpu/x86/smm/smm.elf -T $(src)/cpu/x86/smm/$(SMM_LDSCRIPT) $(obj)/cpu/x86/smm/smm.o +$(obj)/cpu/x86/smm/smm_wrap: $(obj)/cpu/x86/smm/smm.o $(src)/cpu/x86/smm/smm.ld + $(LD_smm) -nostdlib -nostartfiles --gc-sections -static -o $(obj)/cpu/x86/smm/smm.elf -T $(src)/cpu/x86/smm/smm.ld $(obj)/cpu/x86/smm/smm.o $(NM_smm) -n $(obj)/cpu/x86/smm/smm.elf | sort > $(obj)/cpu/x86/smm/smm.map $(OBJCOPY_smm) -O binary $(obj)/cpu/x86/smm/smm.elf $(obj)/cpu/x86/smm/smm @@ -102,10 +102,6 @@ ramstage-srcs += $(obj)/cpu/x86/smm/smm_wrap.manual endif smm-y += smmhandler.S -SMM_LDFLAGS := -SMM_LDSCRIPT := smm.ld - smm-y += smihandler.c - endif # CONFIG_SMM_TSEG