Skip to content

Commit 430ad3f

Browse files
committed
alpha: remove LCA and APECS based machines
APECS is the DECchip 21071x chipset for the EV4 and EV45 generation, while LCA is the integrated I/O support on the corresponding low-cost alpha machines of that generation. All of these CPUs lack the BWX extension for byte and word access, so drop the chipset support and all associated machines. Acked-by: Paul E. McKenney <[email protected]> Acked-by: Matt Turner <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
1 parent d2b1e35 commit 430ad3f

File tree

18 files changed

+21
-2940
lines changed

18 files changed

+21
-2940
lines changed

arch/alpha/Kconfig

Lines changed: 5 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -90,20 +90,12 @@ choice
9090
<http://www.alphalinux.org/>. In summary:
9191

9292
Alcor/Alpha-XLT AS 600, AS 500, XL-300, XL-366
93-
Alpha-XL XL-233, XL-266
94-
AlphaBook1 Alpha laptop
95-
Avanti AS 200, AS 205, AS 250, AS 255, AS 300, AS 400
96-
Cabriolet AlphaPC64, AlphaPCI64
9793
DP264 DP264 / DS20 / ES40 / DS10 / DS10L
9894
EB164 EB164 21164 evaluation board
99-
EB64+ EB64+ 21064 evaluation board
100-
EB66 EB66 21066 evaluation board
101-
EB66+ EB66+ 21066 evaluation board
10295
LX164 AlphaPC164-LX
10396
Miata Personal Workstation 433/500/600 a/au
10497
Marvel AlphaServer ES47 / ES80 / GS1280
10598
Mikasa AS 1000
106-
Noname AXPpci33, UDB (Multia)
10799
Noritake AS 1000A, AS 600A, AS 800
108100
PC164 AlphaPC164
109101
Rawhide AS 1200, AS 4000, AS 4100
@@ -135,27 +127,6 @@ config ALPHA_ALCOR
135127
all the work required to support an external Bcache and to maintain
136128
memory coherence when a PCI device DMAs into (or out of) memory.
137129

138-
config ALPHA_XL
139-
bool "Alpha-XL"
140-
help
141-
XL-233 and XL-266-based Alpha systems.
142-
143-
config ALPHA_BOOK1
144-
bool "AlphaBook1"
145-
help
146-
Dec AlphaBook1/Burns Alpha-based laptops.
147-
148-
config ALPHA_AVANTI_CH
149-
bool "Avanti"
150-
151-
config ALPHA_CABRIOLET
152-
bool "Cabriolet"
153-
help
154-
Cabriolet AlphaPC64, AlphaPCI64 systems. Derived from EB64+ but now
155-
baby-AT with Flash boot ROM, no on-board SCSI or Ethernet. 3 ISA
156-
slots, 4 PCI slots (one pair are on a shared slot), uses plug-in
157-
Bcache SIMMs. Requires power supply with 3.3V output.
158-
159130
config ALPHA_DP264
160131
bool "DP264"
161132
help
@@ -173,23 +144,6 @@ config ALPHA_EB164
173144
MOUSE (PS2 style), RTC/NVRAM. Boot ROM is Flash. PC-AT-sized
174145
motherboard. Requires power supply with 3.3V output.
175146

176-
config ALPHA_EB64P_CH
177-
bool "EB64+"
178-
179-
config ALPHA_EB66
180-
bool "EB66"
181-
help
182-
A Digital DS group board. Uses 21066 or 21066A. I/O sub-system is
183-
identical to EB64+. Baby PC-AT size. Runs from standard PC power
184-
supply. The EB66 schematic was published as a marketing poster
185-
advertising the 21066 as "the first microprocessor in the world with
186-
embedded PCI".
187-
188-
config ALPHA_EB66P
189-
bool "EB66+"
190-
help
191-
Later variant of the EB66 board.
192-
193147
config ALPHA_EIGER
194148
bool "Eiger"
195149
help
@@ -224,9 +178,6 @@ config ALPHA_NAUTILUS
224178
help
225179
Alpha systems based on the AMD 751 & ALI 1543C chipsets.
226180

227-
config ALPHA_NONAME_CH
228-
bool "Noname"
229-
230181
config ALPHA_NORITAKE
231182
bool "Noritake"
232183
select HAVE_EISA
@@ -237,9 +188,6 @@ config ALPHA_NORITAKE
237188
config ALPHA_PC164
238189
bool "PC164"
239190

240-
config ALPHA_P2K
241-
bool "Platform2000"
242-
243191
config ALPHA_RAWHIDE
244192
bool "Rawhide"
245193
select HAVE_EISA
@@ -303,53 +251,16 @@ config ISA_DMA_API
303251
bool
304252
default y
305253

306-
config ALPHA_NONAME
307-
bool
308-
depends on ALPHA_BOOK1 || ALPHA_NONAME_CH
309-
default y
310-
help
311-
The AXPpci33 (aka NoName), is based on the EB66 (includes the Multia
312-
UDB). This design was produced by Digital's Technical OEM (TOEM)
313-
group. It uses the 21066 processor running at 166MHz or 233MHz. It
314-
is a baby-AT size, and runs from a standard PC power supply. It has
315-
5 ISA slots and 3 PCI slots (one pair are a shared slot). There are
316-
2 versions, with either PS/2 or large DIN connectors for the
317-
keyboard.
318-
319254
config ALPHA_EV4
320255
bool
321-
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
322-
default y
323-
324-
config ALPHA_LCA
325-
bool
326-
depends on ALPHA_NONAME || ALPHA_EB66 || ALPHA_EB66P || ALPHA_P2K
327-
default y
328-
329-
config ALPHA_APECS
330-
bool
331-
depends on !ALPHA_PRIMO && (ALPHA_NORITAKE || ALPHA_MIKASA) || ALPHA_CABRIOLET || ALPHA_AVANTI_CH || ALPHA_EB64P_CH || ALPHA_XL
332-
default y
333-
334-
config ALPHA_EB64P
335-
bool
336-
depends on ALPHA_CABRIOLET || ALPHA_EB64P_CH
337-
default y
338-
help
339-
Uses 21064 or 21064A and APECs. Has ISA and PCI expansion (3 ISA,
340-
2 PCI, one pair are on a shared slot). Supports 36-bit DRAM SIMs.
341-
ISA bus generated by Intel SaturnI/O PCI-ISA bridge. On-board SCSI
342-
(NCR 810 on PCI) Ethernet (Digital 21040), KBD, MOUSE (PS2 style),
343-
SuperI/O (2S, 1P, FD), RTC/NVRAM. Boot ROM is EPROM. PC-AT size.
344-
Runs from standard PC power supply.
345256

346257
config ALPHA_EV5
347258
bool
348-
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
259+
default y if ALPHA_RX164 || ALPHA_RAWHIDE || ALPHA_MIATA || ALPHA_LX164 || ALPHA_SX164 || ALPHA_RUFFIAN || ALPHA_SABLE || ALPHA_NORITAKE || ALPHA_MIKASA || ALPHA_PC164 || ALPHA_TAKARA || ALPHA_EB164 || ALPHA_ALCOR
349260

350261
config ALPHA_CIA
351262
bool
352-
depends on ALPHA_MIATA || ALPHA_LX164 || ALPHA_SX164 || ALPHA_RUFFIAN || ALPHA_NORITAKE && ALPHA_PRIMO || ALPHA_MIKASA && ALPHA_PRIMO || ALPHA_PC164 || ALPHA_TAKARA || ALPHA_EB164 || ALPHA_ALCOR
263+
depends on ALPHA_MIATA || ALPHA_LX164 || ALPHA_SX164 || ALPHA_RUFFIAN || ALPHA_NORITAKE || ALPHA_MIKASA || ALPHA_PC164 || ALPHA_TAKARA || ALPHA_EB164 || ALPHA_ALCOR
353264
default y
354265

355266
config ALPHA_EV56
@@ -358,18 +269,12 @@ config ALPHA_EV56
358269

359270
config ALPHA_EV56
360271
prompt "EV56 CPU (speed >= 333MHz)?"
361-
depends on ALPHA_NORITAKE || ALPHA_PRIMO
272+
depends on ALPHA_NORITAKE || ALPHA_MIKASA
362273

363274
config ALPHA_EV56
364275
prompt "EV56 CPU (speed >= 400MHz)?"
365276
depends on ALPHA_RAWHIDE
366277

367-
config ALPHA_PRIMO
368-
bool "EV5 CPU daughtercard (model 5/xxx)?"
369-
depends on ALPHA_NORITAKE || ALPHA_MIKASA
370-
help
371-
Say Y if you have an AS 1000 5/xxx or an AS 1000A 5/xxx.
372-
373278
config ALPHA_T2
374279
bool
375280
depends on ALPHA_SABLE
@@ -416,15 +321,6 @@ config GENERIC_HWEIGHT
416321
bool
417322
default y if !ALPHA_EV67
418323

419-
config ALPHA_AVANTI
420-
bool
421-
depends on ALPHA_XL || ALPHA_AVANTI_CH
422-
default y
423-
help
424-
Avanti AS 200, AS 205, AS 250, AS 255, AS 300, and AS 400-based
425-
Alphas. Info at
426-
<http://www.unix-ag.org/Linux-Alpha/Architectures/Avanti.html>.
427-
428324
config ALPHA_BROKEN_IRQ_MASK
429325
bool
430326
depends on ALPHA_GENERIC || ALPHA_PC164
@@ -454,7 +350,7 @@ config ALPHA_QEMU
454350

455351

456352
config ALPHA_SRM
457-
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
353+
bool "Use SRM as bootloader" if ALPHA_PC164 || ALPHA_TAKARA || ALPHA_EB164 || ALPHA_ALCOR || ALPHA_MIATA || ALPHA_LX164 || ALPHA_SX164 || ALPHA_NAUTILUS
458354
depends on TTY
459355
default y if ALPHA_MIKASA || ALPHA_SABLE || ALPHA_NORITAKE || ALPHA_DP264 || ALPHA_RAWHIDE || ALPHA_EIGER || ALPHA_WILDFIRE || ALPHA_TITAN || ALPHA_SHARK || ALPHA_MARVEL
460356
help
@@ -518,7 +414,7 @@ config ARCH_SPARSEMEM_ENABLE
518414
config ALPHA_WTINT
519415
bool "Use WTINT" if ALPHA_SRM || ALPHA_GENERIC
520416
default y if ALPHA_QEMU
521-
default n if ALPHA_EV5 || ALPHA_EV56 || (ALPHA_EV4 && !ALPHA_LCA)
417+
default n if ALPHA_EV5 || ALPHA_EV56
522418
default n if !ALPHA_SRM && !ALPHA_GENERIC
523419
default y if SMP
524420
help

0 commit comments

Comments
 (0)