From fb9a6ae4048611529f28c5ad05f2c84494cec812 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Wed, 29 May 2013 13:12:20 -0700 Subject: [PATCH] armv7a: Enable native memcpy / memset The code has been there for quite a while but was never enabled. BUG=none TEST=none BRANCH=none Change-Id: Ifc30e735e78f88ab2c84e374e2aa245b370c4e03 Signed-off-by: Stefan Reinauer Reviewed-on: https://gerrit.chromium.org/gerrit/57018 Reviewed-by: Hung-Te Lin Reviewed-by: David Hendricks Tested-by: Stefan Reinauer --- src/arch/armv7/Kconfig | 8 ++++++++ src/arch/armv7/Makefile.inc | 9 +++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/arch/armv7/Kconfig b/src/arch/armv7/Kconfig index 7f4d75e270..633c5ef98d 100644 --- a/src/arch/armv7/Kconfig +++ b/src/arch/armv7/Kconfig @@ -32,4 +32,12 @@ config UPDATE_IMAGE is a suitable file for further processing. The bootblock will not be modified. +config HAVE_ARCH_MEMSET + bool + default y + +config HAVE_ARCH_MEMCPY + bool + default y + endmenu diff --git a/src/arch/armv7/Makefile.inc b/src/arch/armv7/Makefile.inc index 3d2847422e..9b9de44a15 100644 --- a/src/arch/armv7/Makefile.inc +++ b/src/arch/armv7/Makefile.inc @@ -172,8 +172,6 @@ romstage-$(CONFIG_EARLY_CONSOLE) += early_console.c ramstage-y += div0.c #ramstage-y += interrupts.c -#ramstage-y += memcpy.S -#ramstage-y += memset.S ramstage-y += cache.c ramstage-y += mmu.c @@ -184,6 +182,13 @@ bootblock-y += eabi_compat.c ramstage-y += boot.c ramstage-y += tables.c +romstage-y += memset.S +ramstage-y += memset.S +bootblock-y += memset.S +romstage-y += memcpy.S +ramstage-y += memcpy.S +bootblock-y += memcpy.S + $(obj)/arch/armv7/coreboot_table.ramstage.o : $(OPTION_TABLE_H) romstage-srcs += $(objgenerated)/crt0.s