From 2f891a08e71b5e60161a893f21fa82f2bd96076b Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Mon, 20 Mar 2017 15:38:02 -0700 Subject: 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 Reviewed-on: https://review.coreboot.org/18976 Tested-by: build bot (Jenkins) --- src/arch/arm64/Makefile.inc | 6 +++--- 1 file 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 -- cgit v1.2.3