From cbe27469c1c5efe965fa830ce650fd882aebaec7 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Fri, 27 Mar 2015 15:32:49 +0100 Subject: x86/smm: Move SMM configuration out of generic Makefile It's x86 specific. This is inspired by the commit listed below, but rewritten to match upstream, and split in smaller pieces to keep intent clear. Change-Id: Iacb91b47c89041435dd27c2c9ad34a231adf21d2 Signed-off-by: Patrick Georgi Based-On-Change-Id: I50af7dacf616e0f8ff4c43f4acc679089ad7022b Based-On-Signed-off-by: Julius Werner Based-On-Reviewed-on: https://chromium-review.googlesource.com/219170 Reviewed-on: http://review.coreboot.org/9115 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/cpu/x86/smm/Makefile.inc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/cpu/x86') diff --git a/src/cpu/x86/smm/Makefile.inc b/src/cpu/x86/smm/Makefile.inc index 971eacf635..b62288a246 100644 --- a/src/cpu/x86/smm/Makefile.inc +++ b/src/cpu/x86/smm/Makefile.inc @@ -27,6 +27,10 @@ $(eval $(call create_class_compiler,smm,x86_64)) $(eval $(call create_class_compiler,smmstub,x86_64)) endif +smmstub-generic-ccopts += -D__SMM__ +smm-generic-ccopts += -D__SMM__ +smm-c-deps:=$$(OPTION_TABLE_H) + $(obj)/cpu/x86/smm/smm.o: $$(smm-objs) $(COMPILER_RT_smm) $(LD_smm) -nostdlib -r -o $@ $(COMPILER_RT_FLAGS_smm) --start-group $(smm-objs) $(COMPILER_RT_smm) --end-group @@ -101,6 +105,7 @@ endif # Use TSEG specific entry point and linker script ifeq ($(CONFIG_SMM_TSEG),y) smm-y += smmhandler_tseg.S +smm-c-ccopts += -fpic SMM_LDFLAGS := -pie SMM_LDSCRIPT := smm_tseg.ld else -- cgit v1.2.3