Commit 4bf85907 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

alpha: cabriolet: remove EV5 CPU support 



The sys_cabriolet.c file includes support for multiple evaluation
boards. pc164 and lx164 are for ev56 CPUs, while the eb164 is
now the last supported machine that only supports ev5 but not
ev56.

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 430ad3f0

arch/alpha/Kconfig

+2 −13
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ choice 


	  Alcor/Alpha-XLT     AS 600, AS 500, XL-300, XL-366

	  DP264               DP264 / DS20 / ES40 / DS10 / DS10L

	  EB164               EB164 21164 evaluation board

	  LX164               AlphaPC164-LX

	  Miata               Personal Workstation 433/500/600 a/au

	  Marvel              AlphaServer ES47 / ES80 / GS1280
@@ -134,16 +133,6 @@ config ALPHA_DP264 
	  API Networks: 264DP, UP2000(+), CS20;

	  Compaq: DS10(E,L), XP900, XP1000, DS20(E), ES40.



config ALPHA_EB164

	bool "EB164"

	help

	  EB164 21164 evaluation board from DEC.  Uses 21164 and ALCOR.  Has

	  ISA and PCI expansion (3 ISA slots, 2 64-bit PCI slots (one is

	  shared with an ISA slot) and 2 32-bit PCI slots.  Uses plus-in

	  Bcache SIMMs. I/O sub-system provides SuperI/O (2S, 1P, FD), KBD,

	  MOUSE (PS2 style), RTC/NVRAM.  Boot ROM is Flash.  PC-AT-sized

	  motherboard.  Requires power supply with 3.3V output.



config ALPHA_EIGER

	bool "Eiger"

	help
@@ -260,7 +249,7 @@ config ALPHA_EV5 


config ALPHA_CIA

	bool

	depends on ALPHA_MIATA || ALPHA_LX164 || ALPHA_SX164 || ALPHA_RUFFIAN || ALPHA_NORITAKE || ALPHA_MIKASA || ALPHA_PC164 || ALPHA_TAKARA || ALPHA_EB164 || ALPHA_ALCOR

	depends on ALPHA_MIATA || ALPHA_LX164 || ALPHA_SX164 || ALPHA_RUFFIAN || ALPHA_NORITAKE || ALPHA_MIKASA || ALPHA_PC164 || ALPHA_TAKARA || ALPHA_ALCOR

	default y



config ALPHA_EV56
@@ -350,7 +339,7 @@ config ALPHA_QEMU 




config ALPHA_SRM

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

	bool "Use SRM as bootloader" if ALPHA_PC164 || ALPHA_TAKARA || ALPHA_ALCOR || ALPHA_MIATA || ALPHA_LX164 || ALPHA_SX164 || ALPHA_NAUTILUS

	depends on TTY

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

	help

arch/alpha/include/asm/irq.h

+1 −2
Original line number Diff line number Diff line
@@ -31,8 +31,7 @@ 
#  define NR_IRQS      (32768 + 16)    /* marvel - 32 pids */

# endif



#elif defined(CONFIG_ALPHA_EB164)     || \

      defined(CONFIG_ALPHA_PC164)     || \

#elif defined(CONFIG_ALPHA_PC164)     || \

      defined(CONFIG_ALPHA_LX164)

# define NR_IRQS	35

arch/alpha/kernel/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ obj-$(CONFIG_ALPHA_WILDFIRE) += core_wildfire.o 


# Board support

obj-$(CONFIG_ALPHA_ALCOR)	+= sys_alcor.o irq_i8259.o irq_srm.o

obj-$(CONFIG_ALPHA_EB164)	+= sys_cabriolet.o irq_i8259.o irq_srm.o \

				   pc873xx.o

obj-$(CONFIG_ALPHA_LX164)	+= sys_cabriolet.o irq_i8259.o irq_srm.o \

				   smc37c93x.o

obj-$(CONFIG_ALPHA_PC164)	+= sys_cabriolet.o irq_i8259.o irq_srm.o \

arch/alpha/kernel/sys_cabriolet.c

+1 −27
Original line number Diff line number Diff line
@@ -6,8 +6,7 @@ 
 *	Copyright (C) 1996 Jay A Estabrook

 *	Copyright (C) 1998, 1999, 2000 Richard Henderson

 *

 * Code supporting the Cabriolet (AlphaPC64), EB66+, and EB164,

 * PC164 and LX164.

 * Code supporting the PC164 and LX164.

 */



#include <linux/kernel.h>
@@ -308,31 +307,6 @@ alphapc164_init_pci(void) 
 * The System Vector

 */



#if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EB164)

struct alpha_machine_vector eb164_mv __initmv = {

	.vector_name		= "EB164",

	DO_EV5_MMU,

	DO_DEFAULT_RTC,

	DO_CIA_IO,

	.machine_check		= cia_machine_check,

	.max_isa_dma_address	= ALPHA_MAX_ISA_DMA_ADDRESS,

	.min_io_address		= DEFAULT_IO_BASE,

	.min_mem_address	= CIA_DEFAULT_MEM_BASE,



	.nr_irqs		= 35,

	.device_interrupt	= cabriolet_device_interrupt,



	.init_arch		= cia_init_arch,

	.init_irq		= cabriolet_init_irq,

	.init_rtc		= common_init_rtc,

	.init_pci		= cia_cab_init_pci,

	.kill_arch		= cia_kill_arch,

	.pci_map_irq		= cabriolet_map_irq,

	.pci_swizzle		= common_swizzle,

};

ALIAS_MV(eb164)

#endif



#if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_LX164)

struct alpha_machine_vector lx164_mv __initmv = {

	.vector_name		= "LX164",