summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2013-07-07 14:04:26 -0700
committerRonald G. Minnich <rminnich@gmail.com>2013-07-14 20:33:58 +0200
commit545c0caac8ff5cc5c8cc80b1c4d6dce5a2e17032 (patch)
treefedaffe28b68d2ecf3b57cc0b51527c651493737
parenteac991629f40bdb0d0d80319249dd378a295e6fa (diff)
Add a HAVE_ARCH_MEMMOVE option to allow overriding memmove.
Change-Id: I4b6a57e7d8e7e685c609b1d85368585b9dd197dc Signed-off-by: Gabe Black <gabeblack@chromium.org> Reviewed-on: http://review.coreboot.org/3761 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
-rw-r--r--src/Kconfig4
-rw-r--r--src/lib/Makefile.inc7
2 files changed, 11 insertions, 0 deletions
diff --git a/src/Kconfig b/src/Kconfig
index 14e7801600..f65c8e3e20 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -244,6 +244,10 @@ config HAVE_ARCH_MEMCPY
bool
default n
+config HAVE_ARCH_MEMMOVE
+ bool
+ default n
+
menu "Chipset"
comment "CPU"
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index d44f4a73e0..f1783ba4b9 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -26,6 +26,9 @@ ifneq ($(CONFIG_HAVE_ARCH_MEMCPY),y)
bootblock-y += memcpy.c
endif
bootblock-y += memcmp.c
+ifneq ($(CONFIG_HAVE_ARCH_MEMMOVE),y)
+bootblock-y += memmove.c
+endif
ifneq ($(CONFIG_HAVE_ARCH_MEMSET),y)
romstage-y += memset.c
@@ -56,7 +59,9 @@ romstage-$(CONFIG_EARLY_CBMEM_INIT) += cbmem.c
endif
romstage-y += compute_ip_checksum.c
+ifneq ($(CONFIG_HAVE_ARCH_MEMMOVE),y)
romstage-y += memmove.c
+endif
romstage-$(CONFIG_ARCH_X86) += gcc.c
ramstage-y += hardwaremain.c
@@ -70,7 +75,9 @@ ifneq ($(CONFIG_HAVE_ARCH_MEMCPY),y)
ramstage-y += memcpy.c
endif
ramstage-y += memcmp.c
+ifneq ($(CONFIG_HAVE_ARCH_MEMMOVE),y)
ramstage-y += memmove.c
+endif
ramstage-y += malloc.c
smm-$(CONFIG_SMM_TSEG) += malloc.c
ramstage-y += delay.c