summaryrefslogtreecommitdiff
path: root/src/arch/arm64/Makefile.inc
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2014-07-10 17:01:22 -0500
committerMarc Jones <marc.jones@se-eng.com>2015-03-04 20:04:18 +0100
commit00263d0d8ee23bbe60ea359ea9cb33d551688980 (patch)
treeb3801ea3ffe2f1380267e4445b1ae9a2f5bffb9f /src/arch/arm64/Makefile.inc
parent0df877a65ac6563f1e46eea9e15e34a366d7105f (diff)
downloadcoreboot-00263d0d8ee23bbe60ea359ea9cb33d551688980.tar.xz
arm64: remove assembly code string functions
Inconsistent progress was observed running ramstage. It was determined that the hand-coded assembly functions were causing issues. Some of the comments seems suspect about the hardware taking care of alignment. The prudent thing to do is to use the C ones. Optimization can come later after maturity. BUG=chrome-os-partner:29923 BRANCH=None TEST=Built and booted to attempting to payload Original-Change-Id: I4137adf9b36b638ed207e4efd57adaac64c6a6c1 Original-Signed-off-by: Aaron Durbin <adurbin@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/207431 Original-Reviewed-by: Furquan Shaikh <furquan@chromium.org> (cherry picked from commit 2762e478c6b59dd30c59aa87a922d0f78c00c0c4) Signed-off-by: Marc Jones <marc.jones@se-eng.com> Change-Id: Id3196b0c2bf41a21db31f999ba437d118875a236 Reviewed-on: http://review.coreboot.org/8587 Reviewed-by: Patrick Georgi <pgeorgi@google.com> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/arch/arm64/Makefile.inc')
-rw-r--r--src/arch/arm64/Makefile.inc18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index 5f778b2b23..6af675b2fc 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -59,9 +59,9 @@ $(obj)/arch/arm64/id.bootblock.o: $(obj)/build.h
bootblock-y += stages.c
bootblock-y += eabi_compat.c
-bootblock-y += memset.S
-bootblock-y += memcpy.S
-bootblock-y += memmove.S
+bootblock-y += ../../lib/memset.c
+bootblock-y += ../../lib/memcpy.c
+bootblock-y += ../../lib/memmove.c
# Build the bootblock
@@ -80,9 +80,9 @@ ifeq ($(CONFIG_ARCH_ROMSTAGE_ARM64),y)
romstage-y += stages.c
romstage-y += div0.c
romstage-y += eabi_compat.c
-romstage-y += memset.S
-romstage-y += memcpy.S
-romstage-y += memmove.S
+romstage-y += ../../lib/memset.c
+romstage-y += ../../lib/memcpy.c
+romstage-y += ../../lib/memmove.c
romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
# Build the romstage
@@ -106,9 +106,9 @@ ramstage-y += cpu.c
ramstage-y += eabi_compat.c
ramstage-y += boot.c
ramstage-y += tables.c
-ramstage-y += memset.S
-ramstage-y += memcpy.S
-ramstage-y += memmove.S
+ramstage-y += ../../lib/memset.c
+ramstage-y += ../../lib/memcpy.c
+ramstage-y += ../../lib/memmove.c
ramstage-y += stage_entry.S
ramstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c