summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiaxun Yang <jiaxun.yang@flygoat.com>2019-01-22 21:04:12 +0800
committerPaul Burton <paul.burton@mips.com>2019-01-22 17:32:23 -0800
commit7e280f6b0549f3c3e9e94206954d49f87c2048d0 (patch)
tree1f1b01a9e24ca5bf401c7a7679a729274a145af4
parentbdea8bb16345aa62622bfe199f9e2ee9a0daa6d9 (diff)
MIPS: Loongson32: Revert ISA level to MIPS32R2
GS232 core have implemented all necessary mips32r2 instructions. Serval missing FP instructions can be emulated by kernel. The issue of di instruction have been solved. Thus we revert the ISA level back to MIPS32R2. Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com> Signed-off-by: Paul Burton <paul.burton@mips.com> Cc: linux-mips@vger.kernel.org Cc: keguang.zhang@gmail.com
-rw-r--r--arch/mips/Kconfig2
-rw-r--r--arch/mips/loongson32/Platform2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 09537d4f656d..0694f2c1aa85 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1864,7 +1864,7 @@ config CPU_LOONGSON2
config CPU_LOONGSON1
bool
select CPU_MIPS32
- select CPU_MIPSR1
+ select CPU_MIPSR2
select CPU_HAS_PREFETCH
select CPU_HAS_LOAD_STORE_LR
select CPU_SUPPORTS_32BIT_KERNEL
diff --git a/arch/mips/loongson32/Platform b/arch/mips/loongson32/Platform
index ca39b4907257..333215593092 100644
--- a/arch/mips/loongson32/Platform
+++ b/arch/mips/loongson32/Platform
@@ -1,4 +1,4 @@
-cflags-$(CONFIG_CPU_LOONGSON1) += -march=mips32 -Wa,--trap
+cflags-$(CONFIG_CPU_LOONGSON1) += -march=mips32r2 -Wa,--trap
platform-$(CONFIG_MACH_LOONGSON32) += loongson32/
cflags-$(CONFIG_MACH_LOONGSON32) += -I$(srctree)/arch/mips/include/asm/mach-loongson32
load-$(CONFIG_CPU_LOONGSON1) += 0xffffffff80200000