aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-mips/sn
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2006-06-07 15:07:29 -0400
committerRalf Baechle <ralf@linux-mips.org>2006-06-19 12:39:21 -0400
commitedc123d18397008fcd4fdf04f60e033ba1042834 (patch)
tree27abf8dda80d61d46c3ee20502e236f1345f77d7 /include/asm-mips/sn
parent8dbd1d3e65f0281ddf9f7b8123ef81763bc2051f (diff)
[MIPS] IP27: Remove leftovers of sable support.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include/asm-mips/sn')
-rw-r--r--include/asm-mips/sn/kldir.h4
-rw-r--r--include/asm-mips/sn/sn0/addrs.h5
-rw-r--r--include/asm-mips/sn/sn0/arch.h11
-rw-r--r--include/asm-mips/sn/sn0/hub.h4
4 files changed, 2 insertions, 22 deletions
diff --git a/include/asm-mips/sn/kldir.h b/include/asm-mips/sn/kldir.h
index fa40e6794f82..97ad52e3cbc7 100644
--- a/include/asm-mips/sn/kldir.h
+++ b/include/asm-mips/sn/kldir.h
@@ -141,7 +141,7 @@
141 */ 141 */
142#define SYMMON_STACK_SIZE 0x8000 142#define SYMMON_STACK_SIZE 0x8000
143 143
144#if defined (PROM) || defined (SABLE) 144#if defined (PROM)
145 145
146/* 146/*
147 * These defines are prom version dependent. No code other than the IP27 147 * These defines are prom version dependent. No code other than the IP27
@@ -178,7 +178,7 @@
178#define IP27_FREEMEM_COUNT 1 178#define IP27_FREEMEM_COUNT 1
179#define IP27_FREEMEM_STRIDE 0 179#define IP27_FREEMEM_STRIDE 0
180 180
181#endif /* PROM || SABLE*/ 181#endif /* PROM */
182/* 182/*
183 * There will be only one of these in a partition so the IO6 must set it up. 183 * There will be only one of these in a partition so the IO6 must set it up.
184 */ 184 */
diff --git a/include/asm-mips/sn/sn0/addrs.h b/include/asm-mips/sn/sn0/addrs.h
index 398815639fb8..7cb9c31f6878 100644
--- a/include/asm-mips/sn/sn0/addrs.h
+++ b/include/asm-mips/sn/sn0/addrs.h
@@ -143,12 +143,7 @@
143#define SN0_WIDGET_BASE(_nasid, _wid) (NODE_SWIN_BASE((_nasid), (_wid))) 143#define SN0_WIDGET_BASE(_nasid, _wid) (NODE_SWIN_BASE((_nasid), (_wid)))
144 144
145/* Turn on sable logging for the processors whose bits are set. */ 145/* Turn on sable logging for the processors whose bits are set. */
146#ifdef SABLE
147#define SABLE_LOG_TRIGGER(_map) \
148 *((volatile hubreg_t *)(IO_BASE + 0x17ffff0)) = (_map)
149#else
150#define SABLE_LOG_TRIGGER(_map) 146#define SABLE_LOG_TRIGGER(_map)
151#endif /* SABLE */
152 147
153#ifndef __ASSEMBLY__ 148#ifndef __ASSEMBLY__
154#define KERN_NMI_ADDR(nasid, slice) \ 149#define KERN_NMI_ADDR(nasid, slice) \
diff --git a/include/asm-mips/sn/sn0/arch.h b/include/asm-mips/sn/sn0/arch.h
index fb78773a5efe..5643a6e639bd 100644
--- a/include/asm-mips/sn/sn0/arch.h
+++ b/include/asm-mips/sn/sn0/arch.h
@@ -13,8 +13,6 @@
13 13
14#include <linux/config.h> 14#include <linux/config.h>
15 15
16#ifndef SABLE
17
18#ifndef SN0XXL /* 128 cpu SMP max */ 16#ifndef SN0XXL /* 128 cpu SMP max */
19/* 17/*
20 * This is the maximum number of nodes that can be part of a kernel. 18 * This is the maximum number of nodes that can be part of a kernel.
@@ -54,15 +52,6 @@
54 */ 52 */
55#define MAX_PARTITIONS MAX_REGIONS 53#define MAX_PARTITIONS MAX_REGIONS
56 54
57
58#else
59
60#define MAX_COMPACT_NODES 4
61#define MAX_NASIDS 4
62#define MAXCPUS 8
63
64#endif
65
66#define NASID_MASK_BYTES ((MAX_NASIDS + 7) / 8) 55#define NASID_MASK_BYTES ((MAX_NASIDS + 7) / 8)
67 56
68/* 57/*
diff --git a/include/asm-mips/sn/sn0/hub.h b/include/asm-mips/sn/sn0/hub.h
index f5dbba6f4610..3e228f8e7969 100644
--- a/include/asm-mips/sn/sn0/hub.h
+++ b/include/asm-mips/sn/sn0/hub.h
@@ -31,10 +31,6 @@
31#include <asm/sn/sn0/hubni.h> 31#include <asm/sn/sn0/hubni.h>
32//#include <asm/sn/sn0/hubcore.h> 32//#include <asm/sn/sn0/hubcore.h>
33 33
34#ifdef SABLE
35#define IP27_NO_HUBUART_INT 1
36#endif
37
38/* Translation of uncached attributes */ 34/* Translation of uncached attributes */
39#define UATTR_HSPEC 0 35#define UATTR_HSPEC 0
40#define UATTR_IO 1 36#define UATTR_IO 1