csky: Fixup vdsp&fpu issues in kernel

This fixup is continue to commit 35ff802af1c4 (csky: fixup remove
vdsp implement for kernel.) and in that patch I didn't finish the
job. We must forbid gcc to generate any vdsp & fpu instructions
and remove vdsp asm in memmove.S.

eg: For GCC it's -mcpu=ck860 and For AS it's -Wa,-mcpu=ck860fv

Signed-off-by: Guo Ren <ren_guo@c-sky.com>

diff --git a/arch/csky/Makefile b/arch/csky/Makefile
index 3607a6e8f66cbd7883caf995589d8d51d9245738..6b87f6c22ad68e3879ccffd466e05699ef99c922 100644 (file)
--- a/arch/csky/Makefile
+++ b/arch/csky/Makefile
@@ -36,7 +36,7 @@ endif
 
 ifneq ($(CSKYABI),)
 MCPU_STR = $(CPUTYPE)$(FPUEXT)$(VDSPEXT)$(TEEEXT)
-KBUILD_CFLAGS += -mcpu=$(MCPU_STR)
+KBUILD_CFLAGS += -mcpu=$(CPUTYPE) -Wa,-mcpu=$(MCPU_STR)
 KBUILD_CFLAGS += -DCSKYCPU_DEF_NAME=\"$(MCPU_STR)\"
 KBUILD_CFLAGS += -msoft-float -mdiv
 KBUILD_CFLAGS += -fno-tree-vectorize

diff --git a/arch/csky/abiv2/memmove.S b/arch/csky/abiv2/memmove.S
index b0c42ecf18896525238d5f0062f9614c4ce2ccb5..5721e73ad3d8f4185059952a903337be80698d36 100644 (file)
--- a/arch/csky/abiv2/memmove.S
+++ b/arch/csky/abiv2/memmove.S
@@ -35,11 +35,7 @@ ENTRY(memmove)
 .L_len_larger_16bytes:
        subi    r1, 16
        subi    r0, 16
-#if defined(__CSKY_VDSPV2__)
-       vldx.8  vr0, (r1), r19
-       PRE_BNEZAD (r18)
-       vstx.8  vr0, (r0), r19
-#elif defined(__CK860__)
+#if defined(__CK860__)
        ldw     r3, (r1, 12)
        stw     r3, (r0, 12)
        ldw     r3, (r1, 8)