From: Jiaxun Yang Date: Tue, 22 Jan 2019 13:04:12 +0000 (+0800) Subject: MIPS: Loongson32: Revert ISA level to MIPS32R2 X-Git-Tag: v5.1-rc1~171^2~44 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=7e280f6b0549f3c3e9e94206954d49f87c2048d0;p=linux.git 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 Signed-off-by: Paul Burton Cc: linux-mips@vger.kernel.org Cc: keguang.zhang@gmail.com --- 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