summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-03-24 16:45:46 +0000
committerStefan Reinauer <stepan@openbios.org>2010-03-24 16:45:46 +0000
commit5f0aefbef54473c20a04ffe04779d13ef100ef73 (patch)
treea0f62696a8a892d897b5968028d47b9ec83772b5
parent7103eb707ab836a371aca89617bf842b78d6c28e (diff)
SMM: remove hack that was needed back in oldconfig times.
These days it even does the wrong thing (not using the .smmobj.o version of vtxprintf.c and printk.c) Also, SMM never needed libgcc, it's only in coreboot_ram for yabel/x86emu's crazy math. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5282 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--src/console/Makefile.inc3
-rw-r--r--src/cpu/x86/smm/Makefile.inc2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc
index d721fb4e33..a5dc735369 100644
--- a/src/console/Makefile.inc
+++ b/src/console/Makefile.inc
@@ -3,6 +3,9 @@ obj-y += console.o
obj-y += vtxprintf.o
obj-y += vsprintf.o
+smmobj-y += printk.o
+smmobj-y += vtxprintf.o
+
initobj-y += vtxprintf.o
driver-$(CONFIG_CONSOLE_SERIAL8250) += uart8250_console.o
diff --git a/src/cpu/x86/smm/Makefile.inc b/src/cpu/x86/smm/Makefile.inc
index 36eb23a5d8..222bbd9bbc 100644
--- a/src/cpu/x86/smm/Makefile.inc
+++ b/src/cpu/x86/smm/Makefile.inc
@@ -27,7 +27,7 @@ smmobj-y += smiutil.o
ifdef POST_EVALUATION
-$(obj)/cpu/x86/smm/smm.o: $(smmobjs) $(obj)/console/printk.o $(obj)/console/vtxprintf.o $(LIBGCC_FILE_NAME)
+$(obj)/cpu/x86/smm/smm.o: $(smmobjs)
$(CC) $(LDFLAGS) -nostdlib -r -o $@ $^
$(obj)/cpu/x86/smm/smm: $(obj)/cpu/x86/smm/smm.o $(src)/cpu/x86/smm/smm.ld $(obj)/ldoptions