diff options
| -rw-r--r-- | Makefile.inc | 11 | ||||
| -rw-r--r-- | src/cpu/x86/smm/Makefile.inc | 5 |
2 files changed, 5 insertions, 11 deletions
diff --git a/Makefile.inc b/Makefile.inc index 59ddf7efec..e80c266848 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -134,21 +134,10 @@ endif bootblock-generic-ccopts += -D__BOOT_BLOCK__ -D__PRE_RAM__ -smmstub-generic-ccopts += -D__SMM__ -smm-generic-ccopts += -D__SMM__ - -# SMM TSEG base is dynamic -ifneq ($(CONFIG_SMM_MODULES),y) -ifeq ($(CONFIG_SMM_TSEG),y) -smm-c-ccopts += -fpic -endif -endif - ramstage-c-deps:=$$(OPTION_TABLE_H) romstage-c-deps:=$$(OPTION_TABLE_H) verstage-c-deps:=$$(OPTION_TABLE_H) bootblock-c-deps:=$$(OPTION_TABLE_H) -smm-c-deps:=$$(OPTION_TABLE_H) ####################################################################### # Add handler to compile ACPI's ASL 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 |