From: Stefan Reinauer Date: Wed, 24 Mar 2010 16:45:46 +0000 (+0000) Subject: SMM: remove hack that was needed back in oldconfig times. X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=coreboot.git;a=commitdiff_plain;h=5f0aefbef54473c20a04ffe04779d13ef100ef73 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 Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5282 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc index d721fb4e3..a5dc73536 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 36eb23a5d..222bbd9bb 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