summaryrefslogtreecommitdiff
path: root/src/arch/arm64/Makefile.inc
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2015-06-08 10:31:55 -0700
committerPatrick Georgi <pgeorgi@google.com>2015-06-23 08:20:11 +0200
commit464f5ca6d61c907be83adea15e68cf93b769fb3d (patch)
tree408c75232b006a2f1d5b7ddf8cfe6d6875850c02 /src/arch/arm64/Makefile.inc
parent3cec871eaa772073ab016194eb24bdc6fb3c675c (diff)
downloadcoreboot-464f5ca6d61c907be83adea15e68cf93b769fb3d.tar.xz
Revert "arm64: remove assembly code string functions"
This reverts commit 00263d0d8ee23bbe60ea359ea9cb33d551688980 to reintroduce optimized string handling functions. BUG=chrome-os-partner:41185 BRANCH=None TEST=Compiles successfully and boots to kernel prompt on Smaug Change-Id: I47f8d8afa5c9ff3fca67d4d0f393336fef03402b Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Original-Commit-Id: eeb38afea828a2727d815e4fb5762cfdd09a2b3a Original-Change-Id: Id053cbcea8b5e7ae29bdd6bb8b6f5e5011c42b00 Original-Signed-off-by: Furquan Shaikh <furquan@google.com> Original-Reviewed-on: https://chromium-review.googlesource.com/275865 Original-Trybot-Ready: Furquan Shaikh <furquan@chromium.org> Original-Tested-by: Furquan Shaikh <furquan@chromium.org> Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> Original-Commit-Queue: Furquan Shaikh <furquan@chromium.org> Reviewed-on: http://review.coreboot.org/10564 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones <marc.jones@se-eng.com>
Diffstat (limited to 'src/arch/arm64/Makefile.inc')
-rw-r--r--src/arch/arm64/Makefile.inc36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index f1d0cb3e66..1aeef7654c 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -66,9 +66,9 @@ bootblock-y += eabi_compat.c
bootblock-y += transition.c transition_asm.S
bootblock-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
-bootblock-y += ../../lib/memset.c
-bootblock-y += ../../lib/memcpy.c
-bootblock-y += ../../lib/memmove.c
+bootblock-y += memset.S
+bootblock-y += memcpy.S
+bootblock-y += memmove.S
# Build the bootblock
@@ -112,15 +112,15 @@ romstage-y += cpu-stubs.c
romstage-y += stages.c
romstage-y += div0.c
romstage-y += eabi_compat.c
-romstage-y += ../../lib/memset.c
-romstage-y += ../../lib/memcpy.c
-romstage-y += ../../lib/memmove.c
+romstage-y += memset.S
+romstage-y += memcpy.S
+romstage-y += memmove.S
romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
romstage-y += transition.c transition_asm.S
-rmodules_arm64-y += ../../lib/memset.c
-rmodules_arm64-y += ../../lib/memcpy.c
-rmodules_arm64-y += ../../lib/memmove.c
+rmodules_arm64-y += memset.S
+rmodules_arm64-y += memcpy.S
+rmodules_arm64-y += memmove.S
rmodules_arm64-y += eabi_compat.c
# Build the romstage
@@ -147,27 +147,27 @@ ramstage-y += cpu_ramstage.c
ramstage-y += eabi_compat.c
ramstage-y += boot.c
ramstage-y += tables.c
-ramstage-y += ../../lib/memset.c
-ramstage-y += ../../lib/memcpy.c
-ramstage-y += ../../lib/memmove.c
+ramstage-y += memset.S
+ramstage-y += memcpy.S
+ramstage-y += memmove.S
ramstage-y += stage_entry.S
ramstage-y += cpu-stubs.c
ramstage-$(CONFIG_ARM64_USE_SPINTABLE) += spintable.c spintable_asm.S
ramstage-$(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE) += arm_tf.c
ramstage-y += transition.c transition_asm.S
-rmodules_arm64-y += ../../lib/memset.c
-rmodules_arm64-y += ../../lib/memcpy.c
-rmodules_arm64-y += ../../lib/memmove.c
+rmodules_arm64-y += memset.S
+rmodules_arm64-y += memcpy.S
+rmodules_arm64-y += memmove.S
rmodules_arm64-y += eabi_compat.c
secmon-y += stage_entry.S
secmon-y += cpu-stubs.c
secmon-y += startup.c
secmon-y += ../../lib/malloc.c
-secmon-y += ../../lib/memset.c
-secmon-y += ../../lib/memcmp.c
-secmon-y += ../../lib/memcpy.c
+secmon-y += memset.S
+secmon-y += memmove.S
+secmon-y += memcpy.S
ramstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c