diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-12-08 00:21:01 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-12-08 00:21:01 +0000 |
| commit | a92da5c62c369c891657c866ae655e835e619b1b (patch) | |
| tree | dc969867b8b6715fb4be99f7ce144cfaec2f5d7c /sys/arch/alpha/conf | |
| parent | a67276bead2aa835bc93c17180c2109635ba693c (diff) | |
Merge to NetBSD 961107, i.e. mostly new bus.h
Diffstat (limited to 'sys/arch/alpha/conf')
| -rw-r--r-- | sys/arch/alpha/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/Makefile.alpha | 4 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/files.alpha | 5 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/std.alpha | 5 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index da2d2e725e3..c2728c4f66b 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.10 1996/11/11 19:43:28 kstailey Exp $ +# $OpenBSD: GENERIC,v 1.11 1996/12/08 00:20:20 niklas Exp $ # $NetBSD: GENERIC,v 1.24 1996/09/27 17:08:32 cgd Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -99,7 +99,7 @@ pci* at ppb? # PCI devices #ahc* at pci? dev ? function ? # AHA-28xx SCSI (NOT 64-BIT) de* at pci? dev ? function ? # 21x4[012]-based Ethernet -en* at pci? dev ? function ? # ENI PCI ATM (untested) +#en* at pci? dev ? function ? # ENI PCI ATM (untested) ep* at pci? dev ? function ? # 3COM 3c59x (untested) fpa* at pci? dev ? function ? # DEC DEFPA FDDI cards le* at pci? dev ? function ? # PCI LANCE Ethernet (untested) diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha index 68f5a96b5cf..5f3eb7aeb4f 100644 --- a/sys/arch/alpha/conf/Makefile.alpha +++ b/sys/arch/alpha/conf/Makefile.alpha @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.alpha,v 1.8 1996/10/30 22:38:41 niklas Exp $ +# $OpenBSD: Makefile.alpha,v 1.9 1996/12/08 00:20:21 niklas Exp $ # $NetBSD: Makefile.alpha,v 1.25 1996/09/27 17:33:04 cgd Exp $ # Makefile for OpenBSD @@ -37,7 +37,7 @@ INCLUDES= -I. -I$S/arch -I$S -nostdinc CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Dalpha CDIAGFLAGS?= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ - -Wno-uninitialized -Wno-format + -Wcast-qual -Wno-uninitialized -Wno-format CMACHFLAGS= -mno-fp-regs CFLAGS= ${DEBUG} -O2 ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS} diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha index 8df2ea1b219..4fa2d3f237c 100644 --- a/sys/arch/alpha/conf/files.alpha +++ b/sys/arch/alpha/conf/files.alpha @@ -1,5 +1,5 @@ -# $OpenBSD: files.alpha,v 1.6 1996/10/30 22:38:45 niklas Exp $ -# $NetBSD: files.alpha,v 1.26 1996/09/27 17:14:35 cgd Exp $ +# $OpenBSD: files.alpha,v 1.7 1996/12/08 00:20:22 niklas Exp $ +# $NetBSD: files.alpha,v 1.27 1996/10/22 21:15:45 cgd Exp $ # # alpha-specific configuration info @@ -69,7 +69,6 @@ include "dev/tc/files.tc" device tcasic: tcbus attach tcasic at mainbus file arch/alpha/tc/tcasic.c tcasic -file arch/alpha/tc/tc_bus_io.c tcasic file arch/alpha/tc/tc_bus_mem.c tcasic file arch/alpha/tc/tc_3000_500.c tcasic & dec_3000_500 file arch/alpha/tc/tc_3000_300.c tcasic & dec_3000_300 diff --git a/sys/arch/alpha/conf/std.alpha b/sys/arch/alpha/conf/std.alpha index 21d789851c8..b780edc31b9 100644 --- a/sys/arch/alpha/conf/std.alpha +++ b/sys/arch/alpha/conf/std.alpha @@ -1,4 +1,4 @@ -# $OpenBSD: std.alpha,v 1.3 1996/10/30 22:38:46 niklas Exp $ +# $OpenBSD: std.alpha,v 1.4 1996/12/08 00:20:23 niklas Exp $ # $NetBSD: std.alpha,v 1.8 1996/09/27 17:18:02 cgd Exp $ # # Standard/required configuration info for OpenBSD/alpha. @@ -6,7 +6,8 @@ machine alpha makeoptions DEBUG="-g" -#makeoptions CWARNFLAGS="-Werror" +# NetBSD has these, OpenBSD has them in CDIAGFLAGS in Makefile.alpha instead. +#makeoptions CWARNFLAGS="-Werror -Wcast-qual" options EXEC_ECOFF options EXEC_ELF64 |