8f0f02d297
- refresh, rebase and reorder patches - JH7110 media drivers have been dropped for now - JH7110 E24 and mailbox drivers were added - JH7100 DMA- and errata-patches have been dropped as they were upstreamed Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From a0eaebc3b3ae079772c1022c47d704c887c375d0 Mon Sep 17 00:00:00 2001
|
|
From: Hal Feng <hal.feng@starfivetech.com>
|
|
Date: Sun, 4 Feb 2024 15:27:09 +0800
|
|
Subject: [PATCH 15/55] riscv/purgatory: Change memcpy to the aligned version
|
|
|
|
Change memcpy to the aligned version, for purgatory.
|
|
|
|
Signed-off-by: Hal Feng <hal.feng@starfivetech.com>
|
|
---
|
|
arch/riscv/purgatory/Makefile | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
--- a/arch/riscv/purgatory/Makefile
|
|
+++ b/arch/riscv/purgatory/Makefile
|
|
@@ -1,6 +1,6 @@
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
|
|
-purgatory-y := purgatory.o sha256.o entry.o string.o ctype.o memcpy.o memset.o
|
|
+purgatory-y := purgatory.o sha256.o entry.o string.o ctype.o memcpy_aligned.o memcpy.o memset.o
|
|
ifeq ($(CONFIG_KASAN_GENERIC)$(CONFIG_KASAN_SW_TAGS),)
|
|
purgatory-y += strcmp.o strlen.o strncmp.o
|
|
endif
|
|
@@ -14,9 +14,12 @@ $(obj)/string.o: $(srctree)/lib/string.c
|
|
$(obj)/ctype.o: $(srctree)/lib/ctype.c FORCE
|
|
$(call if_changed_rule,cc_o_c)
|
|
|
|
-$(obj)/memcpy.o: $(srctree)/arch/riscv/lib/memcpy.S FORCE
|
|
+$(obj)/memcpy_aligned.o: $(srctree)/arch/riscv/lib/memcpy_aligned.S FORCE
|
|
$(call if_changed_rule,as_o_S)
|
|
|
|
+$(obj)/memcpy.o: $(srctree)/arch/riscv/lib/string.c FORCE
|
|
+ $(call if_changed_rule,cc_o_c)
|
|
+
|
|
$(obj)/memset.o: $(srctree)/arch/riscv/lib/memset.S FORCE
|
|
$(call if_changed_rule,as_o_S)
|
|
|