summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2017-03-20 15:38:02 -0700
committerJulius Werner <jwerner@chromium.org>2017-03-28 22:11:38 +0200
commit2f891a08e71b5e60161a893f21fa82f2bd96076b (patch)
treeb10b78eb7d924f7790994d37e7f5e8bf471314b3 /src/arch
parent893eda0cc5c8b70faf4f623c95dcf2b68f3cd0d3 (diff)
downloadcoreboot-2f891a08e71b5e60161a893f21fa82f2bd96076b.tar.xz
arm64: Fix verstage to use proper assembly versions of mem*()
Due to an unfortunate race between adding verstage support and reverting an earlier hack that disabled the optimized assembly versions of memcpy(), memmove() and memset() on ARM64, it seems that we never enabled the optimized code for the verstage. This should be fixed so that all stages use the same architecture support code. Change-Id: I0bf3245e346105492030f4b133729c4d11bdb3ff Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://review.coreboot.org/18976 Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/arm64/Makefile.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index 95bc58dcf7..7f3ce3fb96 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -72,9 +72,9 @@ $(objcbfs)/verstage.debug: $(objgenerated)/libverstage.a $$(verstage-objs)
verstage-y += boot.c
verstage-y += div0.c
verstage-y += eabi_compat.c
-verstage-y += ../../lib/memset.c
-verstage-y += ../../lib/memcpy.c
-verstage-y += ../../lib/memmove.c
+verstage-y += memset.S
+verstage-y += memcpy.S
+verstage-y += memmove.S
verstage-y += transition.c transition_asm.S