MIPS: remove checks for CONFIG_SGI_IP35

Ever since (shortly before) v2.4.0 there have been checks for CONFIG_SGI_IP35. But a Kconfig symbol SGI_IP35 was never added to the tree. Remove these checks.

---
Untested.

For some reason CONFIG_SGI_IP35 was heavily used in arch/ia64 too. Anyhow, IA64 has dropped that macro years ago.

 arch/mips/include/asm/sn/addrs.h    |  2 --
 arch/mips/include/asm/sn/agent.h    |  4 +---
 arch/mips/include/asm/sn/klconfig.h | 18 +-----------------
 3 files changed, 2 insertions(+), 22 deletions(-)

index 66814f8ba8e8..b18772778a79 100644
@@ -20,8 +20,6 @@
 
 #if defined(CONFIG_SGI_IP27)
 #include <asm/sn/sn0/addrs.h>
-#elif defined(CONFIG_SGI_IP35)
-#include <asm/sn/sn1/addrs.h>
 #endif
 
 

index e33d09293019..fe84c1fc8551 100644
@@ -16,9 +16,7 @@
 
 #if defined(CONFIG_SGI_IP27)
 #include <asm/sn/sn0/hub.h>
-#elif defined(CONFIG_SGI_IP35)
-#include <asm/sn/sn1/hub.h>
-#endif	/* !CONFIG_SGI_IP27 && !CONFIG_SGI_IP35 */
+#endif
 
 /*
  * NIC register macros

index 467c313d5767..f0ec614afa92 100644
@@ -40,26 +40,10 @@
 //#include <sys/graph.h>
 //#include <sys/xtalk/xbow.h>
 
-#elif defined(CONFIG_SGI_IP35)
-
-#include <asm/sn/sn1/addrs.h>
-#include <sys/sn/router.h>
-#include <sys/graph.h>
-#include <asm/xtalk/xbow.h>
-
-#endif /* !CONFIG_SGI_IP27 && !CONFIG_SGI_IP35 */
-
-#if defined(CONFIG_SGI_IP27) || defined(CONFIG_SGI_IP35)
 #include <asm/sn/agent.h>
 #include <asm/fw/arc/types.h>
 #include <asm/fw/arc/hinv.h>
-#if defined(CONFIG_SGI_IP35)
-// The hack file has to be before vector and after sn0_fru....
-#include <asm/hack.h>
-#include <asm/sn/vector.h>
-#include <asm/xtalk/xtalk.h>
-#endif /* CONFIG_SGI_IP35 */
-#endif /* CONFIG_SGI_IP27 || CONFIG_SGI_IP35 */
+#endif
 
 typedef u64  nic_t;
 

1.9.0

[snip]

IP35, on the MIPS side, refers to the SGI Origin 300/3000 family and its derivatives, including Fuel and Tezro. Altix is basically just the ia64 version of an Origin 300/3000.

An experimental tree based on 2.6.34, which was a start on booting Linux on these machines, is here:
http://git.linux-mips.org/?p=ralf/linux-ip35.git;a=summary

However, progress halted when the MAC address couldn't be properly found by probing the machine. I think OpenBSD figured this bit out, though, so maybe IP35 support can get another look at some point.

Joshua Kinard
Gentoo/MIPS
[email protected]
4096R/D25D95E3 2011-03-28

"The past tempts us, the present confuses us, the future frightens us.  And
our lives slip away, moment by moment, lost in that vast, terrible in-between."

--Emperor Turhan, Centauri Republic

The #ifdefs exist because these headers are originally from IRIX and the equivalent IRIX definitions were converted to Linux-style. For the IA64 version keeping those ifdefs around obviously made no sense since - since IP35 (Origin 300/3000 series) is MIPS-based, so it was dropped again.

There is some out-of-tree support for IP35 so I'd like to drop this patch.

Ralf

Nice to know. Thanks.

Thanks for handling this (and the similar) patches so quickly. I disagree with your decision here. But there are many, many issues like this still left in the tree. So there's no point in making noise about just this one Kconfig macro.

By the way, could you perhaps look at CONFIG_SYS_HAS_CPU_RM9000? It seems the Kconfig entry for SYS_HAS_CPU_RM9000 is simply missing. But the CPU support code is rather complicated and I stopped trying to understand it after staring at it for way too long.

Thanks again,

Paul Bolle

Seem that crept back in through commit 69f24d17 [MIPS: Optimize current_cpu_type() for better code.] which had been developed before but merged after RM9000 was removed.

There were various other artifacts of the RM9000 support around which I also removed. Only a few comments and PRID_IMP_RM9000 which helps avoid accidental reuse of the value are now remaining.

Ralf