malta: update MIPS64 ISA to R2

Usage of current R1 ISA is inconsistent with the MIPS32 subtarget, little
used and has limited utility for testing.

Many distros target a minimum R2 ISA. Debian MIPS 32-bit/64-bit ports all
use MIPS R2 ISA since Stretch, for example. Fedora's MIPS arch also targets
the R2 ISA for 32-bit/64-bit.

Widely used MIPS64 platforms like Octeon are based on the MIPS R2 ISA or
later, and benefit from having a compatible test platform in OpenWRT.

While Linux does support MIPS64 R1 targets, its usefulness for development
and testing is limited. As an example, the modern Linux eBPF JIT requires
a MIPS R2 ISA or later.

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>

diff --git a/include/target.mk b/include/target.mk
index 03550c6ca646dac04778c7263280e90237079eb8..b77dffd79f90f765ce5163c4b9b26d8bb4df2798 100644 (file)
--- a/include/target.mk
+++ b/include/target.mk
@@ -198,6 +198,7 @@ ifeq ($(DUMP),1)
     CPU_CFLAGS += -mno-branch-likely
     CPU_CFLAGS_mips32 = -mips32 -mtune=mips32
     CPU_CFLAGS_mips64 = -mips64 -mtune=mips64 -mabi=64
+    CPU_CFLAGS_mips64r2 = -mips64r2 -mtune=mips64r2 -mabi=64
     CPU_CFLAGS_24kc = -mips32r2 -mtune=24kc
     CPU_CFLAGS_74kc = -mips32r2 -mtune=74kc
     CPU_CFLAGS_octeonplus = -march=octeon+ -mabi=64

diff --git a/target/linux/malta/be64/config-default b/target/linux/malta/be64/config-default
index e7352e68ee62462e0c0edd6cf5494a626cf02e0c..7f0b69539465da95ba640429e77cf4819696c887 100644 (file)
--- a/target/linux/malta/be64/config-default
+++ b/target/linux/malta/be64/config-default
@@ -8,7 +8,7 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 CONFIG_CPU_MIPS64=y
-CONFIG_CPU_MIPS64_R1=y
+CONFIG_CPU_MIPS64_R2=y
 CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_HUGEPAGES=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y

diff --git a/target/linux/malta/be64/target.mk b/target/linux/malta/be64/target.mk
index 3a5bb6a6dc49344675268af8103b42404321bb6a..e992c2c69860bf2655495ca2f11d12db9ad92829 100644 (file)
--- a/target/linux/malta/be64/target.mk
+++ b/target/linux/malta/be64/target.mk
@@ -1,5 +1,5 @@
 ARCH:=mips64
-CPU_TYPE:=mips64
+CPU_TYPE:=mips64r2
 SUBTARGET:=be64
 FEATURES+=source-only
 BOARDNAME:=Big Endian (64-bits)

diff --git a/target/linux/malta/le64/config-default b/target/linux/malta/le64/config-default
index 23e838aaba418e0744a86facb64bae7146059f02..c79a2318cc5be7fbe3c5f378c6d0274a6383467d 100644 (file)
--- a/target/linux/malta/le64/config-default
+++ b/target/linux/malta/le64/config-default
@@ -7,7 +7,7 @@ CONFIG_ARCH_MMAP_RND_BITS_MIN=12
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_CPU_MIPS64=y
-CONFIG_CPU_MIPS64_R1=y
+CONFIG_CPU_MIPS64_R2=y
 CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_HUGEPAGES=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y

diff --git a/target/linux/malta/le64/target.mk b/target/linux/malta/le64/target.mk
index a0a55af5f778ab156f5ef0ac65bc447184322f3e..59dcc86befe2574d90d9e7f397e57c2499fd43ee 100644 (file)
--- a/target/linux/malta/le64/target.mk
+++ b/target/linux/malta/le64/target.mk
@@ -1,5 +1,5 @@
 ARCH:=mips64el
-CPU_TYPE:=mips64
+CPU_TYPE:=mips64r2
 SUBTARGET:=le64
 FEATURES+=source-only
 BOARDNAME:=Little Endian (64-bits)