diff options
| author | Vladimir Serbinenko <phcoder@gmail.com> | 2015-05-28 21:09:31 +0200 |
|---|---|---|
| committer | Vladimir Serbinenko <phcoder@gmail.com> | 2015-05-28 22:07:58 +0200 |
| commit | 44cbe10f592965d7611d8624f94f2952d42eba35 (patch) | |
| tree | 4da983e52c73cc30653c18946fe6afdd014cb0f7 /src/cpu/x86/smm/Makefile.inc | |
| parent | beb45020ace2b2d3f6cf4b88f9e7218c33a6225b (diff) | |
smm: Merge configs SMM_MODULES and SMM_TSEG
SMM_TSEG now implies SMM_MODULES and SMM_MODULES can't be used without SMM_TSEG
Remove some newly dead code while on it.
Change-Id: I2e1818245170b1e0abbd853bedf856cec83b92f2
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/10355
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/cpu/x86/smm/Makefile.inc')
| -rw-r--r-- | src/cpu/x86/smm/Makefile.inc | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/cpu/x86/smm/Makefile.inc b/src/cpu/x86/smm/Makefile.inc index 9f8f1d2760..60b0388386 100644 --- a/src/cpu/x86/smm/Makefile.inc +++ b/src/cpu/x86/smm/Makefile.inc @@ -34,7 +34,7 @@ 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) --whole-archive --start-group $(smm-objs) --no-whole-archive $(COMPILER_RT_smm) --end-group -ifeq ($(CONFIG_SMM_MODULES),y) +ifeq ($(CONFIG_SMM_TSEG),y) smmstub-y += smm_stub.S @@ -79,7 +79,7 @@ else cd $(dir $@); $(OBJCOPY_smm) -I binary $(notdir $<) -O elf64-x86_64 -B x86_64 $(notdir $@) endif -else # CONFIG_SMM_MODULES +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 @@ -101,19 +101,11 @@ ifeq ($(CONFIG_HAVE_SMI_HANDLER),y) ramstage-srcs += $(obj)/cpu/x86/smm/smm_wrap.manual 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 smm-y += smmhandler.S SMM_LDFLAGS := SMM_LDSCRIPT := smm.ld -endif smm-y += smihandler.c -endif # CONFIG_SMM_MODULES +endif # CONFIG_SMM_TSEG |