diff options
| author | Stefan Reinauer <reinauer@chromium.org> | 2012-03-30 16:28:20 -0700 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2012-04-04 19:45:10 +0200 |
| commit | fb89dd0a9357f6c633772ac5d0a4b6b1c2d563c0 (patch) | |
| tree | 45fdbd20deb3fbc63b8506d3eb484f6f96fc5f09 | |
| parent | 8e073829ec69ee89b3e91f4c040c96988084a526 (diff) | |
Use fast memset in SMM mode, too
... and always include IP checksumming in romstage.
It's generally useful and our upcoming port needs it.
Change-Id: I248402d96a23e58354744e053b9d5cca6b74ad3a
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/827
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
| -rw-r--r-- | src/arch/x86/lib/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/lib/Makefile.inc | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/arch/x86/lib/Makefile.inc b/src/arch/x86/lib/Makefile.inc index 8f5fd5f1eb..4375952c19 100644 --- a/src/arch/x86/lib/Makefile.inc +++ b/src/arch/x86/lib/Makefile.inc @@ -15,6 +15,7 @@ romstage-y += cbfs_and_run.c romstage-y += memset.c romstage-y += memcpy.c +smm-y += memset.c smm-y += memcpy.c $(obj)/arch/x86/lib/console.ramstage.o :: $(obj)/build.h diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 8ce72b2a9d..7c081ac269 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -17,9 +17,10 @@ romstage-$(CONFIG_CONSOLE_SERIAL8250) += uart8250.c romstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem.c romstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c -romstage-$(CONFIG_CONSOLE_NE2K) += compute_ip_checksum.c romstage-$(CONFIG_USBDEBUG) += usbdebug.c romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c +romstage-y += compute_ip_checksum.c +romstage-y += memmove.c ifneq ($(CONFIG_HAVE_ARCH_MEMSET),y) ramstage-y += memset.c @@ -51,10 +52,13 @@ ramstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c driver-$(CONFIG_CONSOLE_NE2K) += ne2k.c +ifneq ($(CONFIG_HAVE_ARCH_MEMSET),y) +smm-y += memset.c +endif ifneq ($(CONFIG_HAVE_ARCH_MEMCPY),y) smm-y += memcpy.c endif -smm-y += cbfs.c memset.c memcmp.c +smm-y += cbfs.c memcmp.c smm-$(CONFIG_CONSOLE_SERIAL8250) += uart8250.c smm-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem.c smm-$(CONFIG_USBDEBUG) += usbdebug.c |