Commit d2b1e353 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

alpha: sable: remove early machine support 



The sable family (Alphaserver 2000 and 2100) comes in variants for
EV4, EV45, EV5 and EV56. Drop support for the earlier ones that
lack support for the BWX extension but keep the later 'gamma'
variant around since that works with EV56 CPUs.

Acked-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Acked-by: default avatarMatt Turner <mattst88@gmail.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent f81f335a

arch/alpha/Kconfig

+7 −22
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ choice 
	  EB66                EB66 21066 evaluation board

	  EB66+               EB66+ 21066 evaluation board

	  LX164               AlphaPC164-LX

	  Lynx                AS 2100A

	  Miata               Personal Workstation 433/500/600 a/au

	  Marvel              AlphaServer ES47 / ES80 / GS1280

	  Mikasa              AS 1000
@@ -203,12 +202,6 @@ config ALPHA_LX164 
	  A technical overview of this board is available at

	  <http://www.unix-ag.org/Linux-Alpha/Architectures/LX164.html>.



config ALPHA_LYNX

	bool "Lynx"

	select HAVE_EISA

	help

	  AlphaServer 2100A-based systems.



config ALPHA_MARVEL

	bool "Marvel"

	help
@@ -325,9 +318,8 @@ config ALPHA_NONAME 


config ALPHA_EV4

	bool

	depends on (ALPHA_SABLE && !ALPHA_GAMMA) || ALPHA_LYNX || ALPHA_NORITAKE && !ALPHA_PRIMO || ALPHA_MIKASA && !ALPHA_PRIMO || ALPHA_CABRIOLET || ALPHA_AVANTI_CH || ALPHA_EB64P_CH || ALPHA_XL || ALPHA_NONAME || ALPHA_EB66 || ALPHA_EB66P || ALPHA_P2K

	default y if !ALPHA_LYNX

	default y if !ALPHA_EV5

	depends on ALPHA_NORITAKE && !ALPHA_PRIMO || ALPHA_MIKASA && !ALPHA_PRIMO || ALPHA_CABRIOLET || ALPHA_AVANTI_CH || ALPHA_EB64P_CH || ALPHA_XL || ALPHA_NONAME || ALPHA_EB66 || ALPHA_EB66P || ALPHA_P2K

	default y



config ALPHA_LCA

	bool
@@ -352,8 +344,8 @@ config ALPHA_EB64P 
	  Runs from standard PC power supply.



config ALPHA_EV5

	bool "EV5 CPU(s) (model 5/xxx)?" if ALPHA_LYNX

	default y if ALPHA_RX164 || ALPHA_RAWHIDE || ALPHA_MIATA || ALPHA_LX164 || ALPHA_SX164 || ALPHA_RUFFIAN || ALPHA_SABLE && ALPHA_GAMMA || ALPHA_NORITAKE && ALPHA_PRIMO || ALPHA_MIKASA && ALPHA_PRIMO || ALPHA_PC164 || ALPHA_TAKARA || ALPHA_EB164 || ALPHA_ALCOR

	bool

	default y if ALPHA_RX164 || ALPHA_RAWHIDE || ALPHA_MIATA || ALPHA_LX164 || ALPHA_SX164 || ALPHA_RUFFIAN || ALPHA_SABLE || ALPHA_NORITAKE && ALPHA_PRIMO || ALPHA_MIKASA && ALPHA_PRIMO || ALPHA_PC164 || ALPHA_TAKARA || ALPHA_EB164 || ALPHA_ALCOR



config ALPHA_CIA

	bool
@@ -378,16 +370,9 @@ config ALPHA_PRIMO 
	help

	  Say Y if you have an AS 1000 5/xxx or an AS 1000A 5/xxx.



config ALPHA_GAMMA

	bool "EV5 CPU(s) (model 5/xxx)?" if ALPHA_SABLE

	depends on ALPHA_SABLE || ALPHA_LYNX

	default ALPHA_LYNX

	help

	  Say Y if you have an AS 2000 5/xxx or an AS 2100 5/xxx.



config ALPHA_T2

	bool

	depends on ALPHA_SABLE || ALPHA_LYNX

	depends on ALPHA_SABLE

	default y



config ALPHA_PYXIS
@@ -471,7 +456,7 @@ config ALPHA_QEMU 
config ALPHA_SRM

	bool "Use SRM as bootloader" if ALPHA_CABRIOLET || ALPHA_AVANTI_CH || ALPHA_EB64P || ALPHA_PC164 || ALPHA_TAKARA || ALPHA_EB164 || ALPHA_ALCOR || ALPHA_MIATA || ALPHA_LX164 || ALPHA_SX164 || ALPHA_NAUTILUS || ALPHA_NONAME

	depends on TTY

	default y if ALPHA_MIKASA || ALPHA_SABLE || ALPHA_LYNX || ALPHA_NORITAKE || ALPHA_DP264 || ALPHA_RAWHIDE || ALPHA_EIGER || ALPHA_WILDFIRE || ALPHA_TITAN || ALPHA_SHARK || ALPHA_MARVEL

	default y if ALPHA_MIKASA || ALPHA_SABLE || ALPHA_NORITAKE || ALPHA_DP264 || ALPHA_RAWHIDE || ALPHA_EIGER || ALPHA_WILDFIRE || ALPHA_TITAN || ALPHA_SHARK || ALPHA_MARVEL

	help

	  There are two different types of booting firmware on Alphas: SRM,

	  which is command line driven, and ARC, which uses menus and arrow
@@ -497,7 +482,7 @@ config ARCH_MAY_HAVE_PC_FDC 


config SMP

	bool "Symmetric multi-processing support"

	depends on ALPHA_SABLE || ALPHA_LYNX || ALPHA_RAWHIDE || ALPHA_DP264 || ALPHA_WILDFIRE || ALPHA_TITAN || ALPHA_GENERIC || ALPHA_SHARK || ALPHA_MARVEL

	depends on ALPHA_SABLE || ALPHA_RAWHIDE || ALPHA_DP264 || ALPHA_WILDFIRE || ALPHA_TITAN || ALPHA_GENERIC || ALPHA_SHARK || ALPHA_MARVEL

	help

	  This enables support for systems with more than one CPU. If you have

	  a system with only one CPU, say N. If you have a system with more

arch/alpha/include/asm/core_t2.h

+0 −8
Original line number Diff line number Diff line
@@ -25,16 +25,8 @@ 
#define T2_MEM_R1_MASK 0x07ffffff  /* Mem sparse region 1 mask is 27 bits */



/* GAMMA-SABLE is a SABLE with EV5-based CPUs */

/* All LYNX machines, EV4 or EV5, use the GAMMA bias also */

#define _GAMMA_BIAS		0x8000000000UL



#if defined(CONFIG_ALPHA_GENERIC)

#define GAMMA_BIAS		alpha_mv.sys.t2.gamma_bias

#elif defined(CONFIG_ALPHA_GAMMA)

#define GAMMA_BIAS		_GAMMA_BIAS

#else

#define GAMMA_BIAS		0

#endif



/*

 * Memory spaces:

arch/alpha/include/asm/irq.h

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ 
# define NR_IRQS	40



#elif defined(CONFIG_ALPHA_DP264) || \

      defined(CONFIG_ALPHA_LYNX)  || \

      defined(CONFIG_ALPHA_SHARK)

# define NR_IRQS	64

arch/alpha/kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ obj-$(CONFIG_ALPHA_RAWHIDE) += sys_rawhide.o irq_i8259.o 
obj-$(CONFIG_ALPHA_RUFFIAN)	+= sys_ruffian.o irq_pyxis.o irq_i8259.o

obj-$(CONFIG_ALPHA_RX164)	+= sys_rx164.o irq_i8259.o

obj-$(CONFIG_ALPHA_SABLE)	+= sys_sable.o

obj-$(CONFIG_ALPHA_LYNX)	+= sys_sable.o

obj-$(CONFIG_ALPHA_BOOK1)	+= sys_sio.o irq_i8259.o irq_srm.o pc873xx.o

obj-$(CONFIG_ALPHA_AVANTI)	+= sys_sio.o irq_i8259.o irq_srm.o pc873xx.o

obj-$(CONFIG_ALPHA_NONAME)	+= sys_sio.o irq_i8259.o irq_srm.o pc873xx.o

arch/alpha/kernel/setup.c

+2 −9
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ WEAK(eb66_mv); 
WEAK(eb66p_mv);

WEAK(eiger_mv);

WEAK(lx164_mv);

WEAK(lynx_mv);

WEAK(marvel_ev7_mv);

WEAK(miata_mv);

WEAK(mikasa_mv);
@@ -198,7 +197,6 @@ WEAK(privateer_mv); 
WEAK(rawhide_mv);

WEAK(ruffian_mv);

WEAK(rx164_mv);

WEAK(sable_mv);

WEAK(sable_gamma_mv);

WEAK(shark_mv);

WEAK(sx164_mv);
@@ -751,7 +749,7 @@ get_sysvec(unsigned long type, unsigned long variation, unsigned long cpu) 
		&alphabook1_mv,

		&rawhide_mv,

		NULL,		/* K2 */

		&lynx_mv,	/* Lynx */

		NULL,		/* Lynx */

		&xl_mv,

		NULL,		/* EB164 -- see variation.  */

		NULL,		/* Noritake -- see below.  */
@@ -905,10 +903,7 @@ get_sysvec(unsigned long type, unsigned long variation, unsigned long cpu) 
				vec = &noritake_mv;

			break;

		case ST_DEC_2100_A500:

			if (cpu == EV5_CPU || cpu == EV56_CPU)

			vec = &sable_gamma_mv;

			else

				vec = &sable_mv;

			break;

		}

	}
@@ -932,7 +927,6 @@ get_sysvec_byname(const char *name) 
		&eb66p_mv,

		&eiger_mv,

		&lx164_mv,

		&lynx_mv,

		&miata_mv,

		&mikasa_mv,

		&mikasa_primo_mv,
@@ -947,7 +941,6 @@ get_sysvec_byname(const char *name) 
		&rawhide_mv,

		&ruffian_mv,

		&rx164_mv,

		&sable_mv,

		&sable_gamma_mv,

		&shark_mv,

		&sx164_mv,