From 8ec6562af12df177aa1ca06ddd26232b8c0df7b1 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sun, 7 Jul 2013 14:04:26 -0700 Subject: [PATCH] Add a HAVE_ARCH_MEMMOVE option to allow overriding memmove. BUG=None TEST=Built and booted on Link and Snow. BRANCH=None Change-Id: I0b05e2d128f3da0f4c9a6ee32de4ed359bf93ccd Signed-off-by: Gabe Black Reviewed-on: https://gerrit.chromium.org/gerrit/61073 Reviewed-by: Ronald G. Minnich Commit-Queue: Gabe Black Tested-by: Gabe Black --- src/Kconfig | 4 ++++ src/lib/Makefile.inc | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/Kconfig b/src/Kconfig index f9fd8be966..d134cec332 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 729cc43a0c..bc1876e374 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 @@ -50,7 +53,9 @@ romstage-$(CONFIG_USBDEBUG) += usbdebug.c romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c romstage-$(CONFIG_EARLY_CBMEM_INIT) += cbmem.c 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 @@ -64,7 +69,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 @@ -108,7 +115,10 @@ endif ifneq ($(CONFIG_HAVE_ARCH_MEMCPY),y) smm-y += memcpy.c endif -smm-y += cbfs.c memmove.c memcmp.c +ifneq ($(CONFIG_HAVE_ARCH_MEMMOVE),y) +smm-y += memmove.c +endif +smm-y += cbfs.c memcmp.c smm-$(CONFIG_CONSOLE_SERIAL8250) += uart8250.c smm-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem.c smm-$(CONFIG_USBDEBUG) += usbdebug.c