Skip to content

Commit 67c642e

Browse files
committed
Merge tag 'csky-for-linus-5.19-rc1' of https://github.com/c-sky/csky-linux
Pull arch/csky updates from Guo Ren: - Three atomic optimizations - memcpy/memcpy_io optimization - Some coding conventions for Kbuild, removing warnings * tag 'csky-for-linus-5.19-rc1' of https://github.com/c-sky/csky-linux: csky: Move $(core-y) into arch/csky/Kbuild csky: Remove unused core-y for dts csky: Remove unused $(dtb-y) from boot/Makefile csky: atomic: Add conditional atomic operations' optimization csky: atomic: Add custom atomic.h implementation csky: atomic: Optimize cmpxchg with acquire & release csky: optimize memcpy_{from,to}io() and memset_io() csky: Add C based string functions csky: Fix versioncheck warnings csky: patch_text: Fixup last cpu should be master csky: fix typos in comments
2 parents fdd8f65 + 64d83f0 commit 67c642e

File tree

22 files changed

+562
-375
lines changed

22 files changed

+562
-375
lines changed

arch/csky/Kbuild

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22

3+
obj-y += kernel/ mm/
4+
35
# for cleaning
46
subdir- += boot

arch/csky/Kconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,14 @@ config HOTPLUG_CPU
320320
controlled through /sys/devices/system/cpu/cpu1/hotplug/target.
321321

322322
Say N if you want to disable CPU hotplug.
323+
324+
config HAVE_EFFICIENT_UNALIGNED_STRING_OPS
325+
bool "Enable EFFICIENT_UNALIGNED_STRING_OPS for abiv2"
326+
depends on CPU_CK807 || CPU_CK810 || CPU_CK860
327+
help
328+
Say Y here to enable EFFICIENT_UNALIGNED_STRING_OPS. Some CPU models could
329+
deal with unaligned access by hardware.
330+
323331
endmenu
324332

325333
source "arch/csky/Kconfig.platforms"

arch/csky/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,12 @@ KBUILD_AFLAGS += $(KBUILD_CFLAGS)
6161

6262
head-y := arch/csky/kernel/head.o
6363

64-
core-y += arch/csky/kernel/
65-
core-y += arch/csky/mm/
6664
core-y += arch/csky/$(CSKYABI)/
6765

6866
libs-y += arch/csky/lib/ \
6967
$(shell $(CC) $(KBUILD_CFLAGS) $(KCFLAGS) -print-libgcc-file-name)
7068

7169
boot := arch/csky/boot
72-
core-y += $(boot)/dts/
7370

7471
all: zImage
7572

arch/csky/abiv1/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,3 @@ obj-y += bswapdi.o
44
obj-y += bswapsi.o
55
obj-y += cacheflush.o
66
obj-y += mmap.o
7-
obj-y += memcpy.o
8-
obj-y += strksyms.o

arch/csky/abiv1/memcpy.S

Lines changed: 0 additions & 347 deletions
This file was deleted.

arch/csky/abiv1/strksyms.c

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)