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: Paul E. McKenney <paulmck@kernel.org>
Acked-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index ee209e895505457c98c862e4efc8900fd5e465e9..7987bb548652f3b14a06ed9e720e433d7f25ffa2 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -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

diff --git a/arch/alpha/include/asm/irq.h b/arch/alpha/include/asm/irq.h
index e7d22357a5a6446ee0620fd712d191a4386c3fa8..d83b26b6660f14f8ead0afedcffe93183f65343e 100644 (file)
--- a/arch/alpha/include/asm/irq.h
+++ b/arch/alpha/include/asm/irq.h
@@ -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
 

diff --git a/arch/alpha/kernel/Makefile b/arch/alpha/kernel/Makefile
index bd5d62fa4a9a6d590feeecf5d384931915d88181..b6c862dff1f647fb891188c125241bbc00a2adc7 100644 (file)
--- a/arch/alpha/kernel/Makefile
+++ b/arch/alpha/kernel/Makefile
@@ -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 \

diff --git a/arch/alpha/kernel/sys_cabriolet.c b/arch/alpha/kernel/sys_cabriolet.c
index 06a950072f82bc602b0b092609960378f96c9bd6..54e75d4fdbe3eb005c03408eb9a9d580526dd618 100644 (file)
--- a/arch/alpha/kernel/sys_cabriolet.c
+++ b/arch/alpha/kernel/sys_cabriolet.c
@@ -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",