From dada036b105e60353ac61da3bb40e09ac87b986f Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Sat, 6 Dec 2025 15:48:42 -0500
Subject: [PATCH] configure:  Partial revert of 6c6bdbf60e3

Turns out I compile-tested stale trees instead of the broken change

Net result is just the simpler MIPS revision (32/64/"classic") lookup rather than
the sub-revision (eg mips32r2 etc).

Change-Id: Ideebe522d29132f00f3769222f3846000b3a89fd
---
 firmware/asm/mips/thread.c | 2 +-
 firmware/export/config.h   | 2 +-
 tools/configure            | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/firmware/asm/mips/thread.c b/firmware/asm/mips/thread.c
index a543f3a348..5b7c30f5ce 100644
--- a/firmware/asm/mips/thread.c
+++ b/firmware/asm/mips/thread.c
@@ -1,4 +1,4 @@
-#if (CPU_MIPS == 32) || (CPU_MIPS == 32r2)
+#if (CPU_MIPS == 32)
   #include "thread-mips32.c"
 #else
   #error Missing thread impl
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 5e4994e137..8fd1e8c0c6 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -729,7 +729,7 @@ Lyre prototype 1 */
 #endif
 
 #if ARCH == ARCH_MIPS
-#define CPU_MIPS ARCH_VERSION /* 32, 32r2, 64 */
+#define CPU_MIPS ARCH_VERSION /* 32, 64 */
 #endif
 
 #endif /*__PCTOOL__*/
diff --git a/tools/configure b/tools/configure
index 654bdab807..b1f8bb2de7 100755
--- a/tools/configure
+++ b/tools/configure
@@ -4785,10 +4785,10 @@ if [ -z "$arch" ]; then
     elif [ -n "$(echo $cpp_defines | grep -w __mips__)" ]; then
         arch="mips"
         arch_version="$(echo "$cpp_defines" | grep 'define __mips ' | sed -e 's,.* \([0-9]\+\).*,\1,')"
-	arch_revision="$(echo "$cpp_defines" | grep 'define __mips_isa_rev ' | sed -e 's,.* \([0-9]\+\).*,\1,')"
-	if [ -n "$arch_revision" ] ; then
-	    arch_version="${arch_version}r${arch_revision}"
-	fi
+#	arch_revision="$(echo "$cpp_defines" | grep 'define __mips_isa_rev ' | sed -e 's,.* \([0-9]\+\).*,\1,')"
+#	if [ -n "$arch_revision" ] ; then
+#	    arch_version="${arch_version}r${arch_revision}"
+#	fi
     elif [ -n "$(echo $cpp_defines | grep -w __i386__)" ]; then
         arch="x86"
     elif [ -n "$(echo $cpp_defines | grep -w __x86_64__)" ]; then