Module Name: src
Committed By: matt
Date: Fri Jun 17 03:55:58 UTC 2011
Modified Files:
src/sys/arch/alpha: Makefile
src/sys/arch/alpha/alpha: cpuconf.c
src/sys/arch/alpha/conf: files.alpha majors.alpha
Removed Files:
src/sys/arch/alpha/a12: a12dc.c a12dcreg.h if_xb.c if_xb.h
src/sys/arch/alpha/alpha: avalon_a12.c
src/sys/arch/alpha/pci: a12c.c a12c_bus_mem.c a12c_dma.c a12c_pci.c
a12creg.h a12cvar.h pci_a12.c pci_a12.h
Log Message:
Remove Avalon A12 support.
ok ross@
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/alpha/Makefile
cvs rdiff -u -r1.26 -r0 src/sys/arch/alpha/a12/a12dc.c
cvs rdiff -u -r1.2 -r0 src/sys/arch/alpha/a12/a12dcreg.h
cvs rdiff -u -r1.27 -r0 src/sys/arch/alpha/a12/if_xb.c
cvs rdiff -u -r1.3 -r0 src/sys/arch/alpha/a12/if_xb.h
cvs rdiff -u -r1.16 -r0 src/sys/arch/alpha/alpha/avalon_a12.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/alpha/alpha/cpuconf.c
cvs rdiff -u -r1.183 -r1.184 src/sys/arch/alpha/conf/files.alpha
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/alpha/conf/majors.alpha
cvs rdiff -u -r1.24 -r0 src/sys/arch/alpha/pci/a12c.c
cvs rdiff -u -r1.7 -r0 src/sys/arch/alpha/pci/a12c_bus_mem.c \
src/sys/arch/alpha/pci/a12c_dma.c
cvs rdiff -u -r1.8 -r0 src/sys/arch/alpha/pci/a12c_pci.c
cvs rdiff -u -r1.2 -r0 src/sys/arch/alpha/pci/a12creg.h
cvs rdiff -u -r1.6 -r0 src/sys/arch/alpha/pci/a12cvar.h
cvs rdiff -u -r1.12 -r0 src/sys/arch/alpha/pci/pci_a12.c
cvs rdiff -u -r1.4 -r0 src/sys/arch/alpha/pci/pci_a12.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/Makefile
diff -u src/sys/arch/alpha/Makefile:1.14 src/sys/arch/alpha/Makefile:1.15
--- src/sys/arch/alpha/Makefile:1.14 Sun Apr 3 23:07:19 2011
+++ src/sys/arch/alpha/Makefile Fri Jun 17 03:55:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2011/04/03 23:07:19 dyoung Exp $
+# $NetBSD: Makefile,v 1.15 2011/06/17 03:55:56 matt Exp $
# Makefile for alpha tags file and boot blocks
@@ -13,7 +13,7 @@
AALPHA= ${SYSDIR}/arch/alpha/alpha/*.s ${SYSDIR}/arch/alpha/pci/*.s
# Directories in which to place tags links
-DALPHA= a12 common eisa include isa jensenio mcbus pci sableio tc tlsb
+DALPHA= common eisa include isa jensenio mcbus pci sableio tc tlsb
.include "../../kern/Make.tags.inc"
Index: src/sys/arch/alpha/alpha/cpuconf.c
diff -u src/sys/arch/alpha/alpha/cpuconf.c:1.33 src/sys/arch/alpha/alpha/cpuconf.c:1.34
--- src/sys/arch/alpha/alpha/cpuconf.c:1.33 Wed Mar 18 10:22:22 2009
+++ src/sys/arch/alpha/alpha/cpuconf.c Fri Jun 17 03:55:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuconf.c,v 1.33 2009/03/18 10:22:22 cegger Exp $ */
+/* $NetBSD: cpuconf.c,v 1.34 2011/06/17 03:55:57 matt Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpuconf.c,v 1.33 2009/03/18 10:22:22 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpuconf.c,v 1.34 2011/06/17 03:55:57 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -124,13 +124,6 @@
#define dec_eb164_init platform_not_configured
#endif
-#include "opt_avalon_a12.h"
-#ifdef AVALON_A12
-extern void avalon_a12_init(void);
-#else
-#define avalon_a12_init platform_not_configured
-#endif
-
#include "opt_dec_kn300.h"
#ifdef DEC_KN300
extern void dec_kn300_init(void);
@@ -219,7 +212,6 @@
cpu_init(ST_DEC_3000_500, dec_3000_500_init, "DEC_3000_500"),
cpu_init(ST_DEC_2000_300, dec_2000_300_init, "DEC_2000_300"),
cpu_init(ST_DEC_3000_300, dec_3000_300_init, "DEC_3000_300"),
- cpu_init(ST_AVALON_A12, avalon_a12_init, "AVALON_A12"),
cpu_init(ST_DEC_2100_A500, dec_2100_a500_init, "DEC_2100_A500"),
cpu_notsupp(ST_DEC_APXVME_64, "AXPvme 64"),
cpu_init(ST_DEC_AXPPCI_33, dec_axppci_33_init, "DEC_AXPPCI_33"),
Index: src/sys/arch/alpha/conf/files.alpha
diff -u src/sys/arch/alpha/conf/files.alpha:1.183 src/sys/arch/alpha/conf/files.alpha:1.184
--- src/sys/arch/alpha/conf/files.alpha:1.183 Sun Jun 12 03:35:37 2011
+++ src/sys/arch/alpha/conf/files.alpha Fri Jun 17 03:55:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.alpha,v 1.183 2011/06/12 03:35:37 rmind Exp $
+# $NetBSD: files.alpha,v 1.184 2011/06/17 03:55:57 matt Exp $
#
# alpha-specific configuration info
@@ -21,7 +21,6 @@
defflag DEC_KN20AA # KN20AA: AlphaStation 500 and 600
defflag DEC_KN8AE # KN8AE: AlphaServer 8200 and 8400
defflag DEC_KN300 # KN300: AlphaServer 4X00
-defflag AVALON_A12 # Avalon: A12T1, A12M Parallel Supercomputer
defflag DEC_1000 # Mikasa etc: AlphaServer 1000
defflag DEC_1000A # Corelle etc: AlphaServer 800 and 1000A
defflag DEC_ALPHABOOK1 # AlphaBook1: Tadpole/DEC AlphaBook
@@ -233,16 +232,6 @@
file arch/alpha/pci/cia_swiz_bus_io.c cia
file arch/alpha/pci/cia_swiz_bus_mem.c cia
-define a12c_xb {}
-define a12c_a12dc {}
-
-device a12c { }: pcibus, a12c_xb, a12c_a12dc
-attach a12c at mainbus
-file arch/alpha/pci/a12c.c a12c
-file arch/alpha/pci/a12c_bus_mem.c a12c
-file arch/alpha/pci/a12c_dma.c a12c
-file arch/alpha/pci/a12c_pci.c a12c
-
device dwlpx: pcibus, alpha_sgmap, alpha_pci_sgmap_pte32
attach dwlpx at kft
file arch/alpha/pci/dwlpx.c dwlpx
@@ -322,7 +311,6 @@
file arch/alpha/pci/pci_2100_a50.c dec_2100_a50
file arch/alpha/pci/pci_2100_a500.c dec_2100_a500 | dec_2100a_a500
file arch/alpha/pci/pci_up1000.c api_up1000
-file arch/alpha/pci/pci_a12.c avalon_a12
file arch/alpha/pci/pci_alphabook1.c dec_alphabook1
file arch/alpha/pci/pci_axppci_33.c dec_axppci_33
file arch/alpha/pci/pci_eb164.c dec_eb164
@@ -355,22 +343,6 @@
file arch/alpha/pci/sio_pic.c sio | pceb
#
-# alpha/a12 platform-specific drivers
-#
-
-# Switch
-
-device xb
-attach xb at a12c_xb
-file arch/alpha/a12/if_xb.c xb
-
-# Console
-
-device a12dc
-attach a12dc at a12c_a12dc
-file arch/alpha/a12/a12dc.c a12dc needs-flag
-
-#
# Devices that can live on multiple busses
#
@@ -434,7 +406,6 @@
file arch/alpha/alpha/dec_kn8ae.c dec_kn8ae
file arch/alpha/alpha/dec_kn300.c dec_kn300
file arch/alpha/alpha/api_up1000.c api_up1000
-file arch/alpha/alpha/avalon_a12.c avalon_a12
file arch/alpha/alpha/dec_1000a.c dec_1000 | dec_1000a
file arch/alpha/alpha/dec_6600.c dec_6600
Index: src/sys/arch/alpha/conf/majors.alpha
diff -u src/sys/arch/alpha/conf/majors.alpha:1.25 src/sys/arch/alpha/conf/majors.alpha:1.26
--- src/sys/arch/alpha/conf/majors.alpha:1.25 Sat Mar 6 23:45:39 2010
+++ src/sys/arch/alpha/conf/majors.alpha Fri Jun 17 03:55:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: majors.alpha,v 1.25 2010/03/06 23:45:39 plunky Exp $
+# $NetBSD: majors.alpha,v 1.26 2011/06/17 03:55:57 matt Exp $
#
# Device majors for alpha
#
@@ -37,7 +37,7 @@
device-major se char 37 se
device-major satlink char 38 satlink
device-major rnd char 39 rnd
-device-major a12dc char 40 a12dc
+#device-major obsolete char 40 obsolete
device-major spkr char 41 spkr
device-major scsibus char 42 scsibus
device-major raid char 43 block 16 raid
