summaryrefslogtreecommitdiff
path: root/sys/arch/alpha/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/alpha/conf')
-rw-r--r--sys/arch/alpha/conf/ALPHA33
-rw-r--r--sys/arch/alpha/conf/BUNNY10
-rw-r--r--sys/arch/alpha/conf/GENERIC32
-rw-r--r--sys/arch/alpha/conf/GENERIC.PROF153
-rw-r--r--sys/arch/alpha/conf/JURA7
-rw-r--r--sys/arch/alpha/conf/Makefile.alpha71
-rw-r--r--sys/arch/alpha/conf/NOSY7
-rw-r--r--sys/arch/alpha/conf/OPAL10
-rw-r--r--sys/arch/alpha/conf/RAMDISK154
-rw-r--r--sys/arch/alpha/conf/files.alpha37
-rw-r--r--sys/arch/alpha/conf/std.alpha7
11 files changed, 433 insertions, 88 deletions
diff --git a/sys/arch/alpha/conf/ALPHA b/sys/arch/alpha/conf/ALPHA
index 084b89e53c6..c02d1012167 100644
--- a/sys/arch/alpha/conf/ALPHA
+++ b/sys/arch/alpha/conf/ALPHA
@@ -1,9 +1,9 @@
-# $OpenBSD: ALPHA,v 1.7 1996/09/20 06:44:49 deraadt Exp $
-# $NetBSD: ALPHA,v 1.14.4.4 1996/06/13 19:21:59 cgd Exp $
+# $OpenBSD: ALPHA,v 1.8 1996/10/30 22:38:37 niklas Exp $
+# $NetBSD: ALPHA,v 1.24 1996/09/27 17:08:32 cgd Exp $
#
# Alpha kernel with all the options you'd want, and more.
-include "std.alpha"
+include "arch/alpha/conf/std.alpha"
maxusers 8
@@ -60,6 +60,7 @@ options COMPAT_43
#options COMPAT_09
options COMPAT_10
options COMPAT_11
+options COMPAT_12
# OSF/1 binary compatibility -- CURRENTLY DOES NOT WORK
#options COMPAT_OSF1
@@ -81,7 +82,11 @@ options LKM
#options INSECURE
# Misc. options
-options PCIVERBOSE # recognize "unknown" PCI devices
+options EISAVERBOSE # recognize "unknown" EISA devices
+options FIX_UNALIGNED_VAX_FP # fix unaligned VAX FP loads & stores
+options PCIVERBOSE # recognize "unknown" PCI devices
+options TCVERBOSE # recognize "unknown" TC devices
+options UCONSOLE # users can use TIOCCONS (for xconsole)
config bsd swap generic
#config bsd root on sd0 swap on sd0
@@ -122,15 +127,18 @@ pci* at lca?
pci* at ppb?
# PCI devices
-de* at pci?
-le* at pci?
-ncr* at pci?
-pceb* at pci?
-pcivga* at pci?
-ppb* at pci?
-sio* at pci?
-tga* at pci?
+#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)
+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)
+ncr* at pci? dev ? function ? # NCR 53c8xx SCSI
+pceb* at pci? dev ? function ? # Intel PCI-EISA brige
+pcivga* at pci? dev ? function ? # PCI VGA graphics
+ppb* at pci? dev ? function ? # PCI-PCI bridges
+sio* at pci? dev ? function ? # Intel PCI-ISA bridge
+tga* at pci? dev ? function ? # DEC ZLXp-E[123] graphics
# ISA/EISA bus support
isa* at pceb?
@@ -172,3 +180,4 @@ pseudo-device sl 4
pseudo-device strip 4
pseudo-device tun 4
pseudo-device vnd 4
+pseudo-device rd 1
diff --git a/sys/arch/alpha/conf/BUNNY b/sys/arch/alpha/conf/BUNNY
index 88803eec57e..1ba7650e2ee 100644
--- a/sys/arch/alpha/conf/BUNNY
+++ b/sys/arch/alpha/conf/BUNNY
@@ -1,12 +1,12 @@
-# $OpenBSD: BUNNY,v 1.6 1996/09/20 06:44:50 deraadt Exp $
-# $NetBSD: BUNNY,v 1.5.4.1 1996/06/13 19:22:03 cgd Exp $
+# $OpenBSD: BUNNY,v 1.7 1996/10/30 22:38:38 niklas Exp $
+# $NetBSD: BUNNY,v 1.9 1996/09/27 17:08:35 cgd Exp $
#
# Kernel for bunnahabhain.pdl.cs.cmu.edu.
#
# Trimmed down kernel for AlphaStation [24]xx systems, with lots
# of buffer cache.
-include "std.alpha"
+include "arch/alpha/conf/std.alpha"
maxusers 8
@@ -42,6 +42,7 @@ options COMPAT_43
#options COMPAT_09
options COMPAT_10
options COMPAT_11
+options COMPAT_12
# Loadable Kernel Modules
options LKM
@@ -50,7 +51,8 @@ options LKM
#options INSECURE
# Misc. options
-options PCIVERBOSE # recognize "unknown" PCI devices
+options PCIVERBOSE # recognize "unknown" PCI devices
+options UCONSOLE # users can use TIOCCONS (for xconsole)
config bsd swap generic
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 801a4e0fde1..42d0eb2facb 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,9 +1,9 @@
-# $OpenBSD: GENERIC,v 1.8 1996/09/20 06:44:50 deraadt Exp $
-# $NetBSD: GENERIC,v 1.15.4.3 1996/06/13 19:22:07 cgd Exp $
+# $OpenBSD: GENERIC,v 1.9 1996/10/30 22:38:38 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.
-include "std.alpha"
+include "arch/alpha/conf/std.alpha"
maxusers 8
@@ -41,6 +41,7 @@ options COMPAT_43
#options COMPAT_09
options COMPAT_10
options COMPAT_11
+options COMPAT_12
# OSF/1 binary compatibility -- CURRENTLY DOES NOT WORK
#options COMPAT_OSF1
@@ -52,7 +53,10 @@ options LKM
#options INSECURE
# Misc. options
-options PCIVERBOSE # recognize "unknown" PCI devices
+options EISAVERBOSE # recognize "unknown" EISA devices
+options PCIVERBOSE # recognize "unknown" PCI devices
+options TCVERBOSE # recognize "unknown" TC devices
+options UCONSOLE # users can use TIOCCONS (for xconsole)
config bsd swap generic
#config bsd root on sd0 swap on sd0
@@ -93,15 +97,18 @@ pci* at lca?
pci* at ppb?
# PCI devices
-de* at pci?
-le* at pci?
-ncr* at pci?
-pceb* at pci?
-pcivga* at pci?
-ppb* at pci?
-sio* at pci?
-tga* at pci?
+#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)
+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)
+ncr* at pci? dev ? function ? # NCR 53c8xx SCSI
+pceb* at pci? dev ? function ? # Intel PCI-EISA brige
+pcivga* at pci? dev ? function ? # PCI VGA graphics
+ppb* at pci? dev ? function ? # PCI-PCI bridges
+sio* at pci? dev ? function ? # Intel PCI-ISA bridge
+tga* at pci? dev ? function ? # DEC ZLXp-E[123] graphics
# ISA/EISA bus support
isa* at pceb?
@@ -140,3 +147,4 @@ pseudo-device loop
pseudo-device pty 64
pseudo-device sl 4
pseudo-device vnd 4
+pseudo-device rd 1
diff --git a/sys/arch/alpha/conf/GENERIC.PROF b/sys/arch/alpha/conf/GENERIC.PROF
new file mode 100644
index 00000000000..5de20fc93c8
--- /dev/null
+++ b/sys/arch/alpha/conf/GENERIC.PROF
@@ -0,0 +1,153 @@
+# $OpenBSD: GENERIC.PROF,v 1.1 1996/10/30 22:38:39 niklas Exp $
+# $NetBSD: GENERIC.PROF,v 1.4 1996/09/27 17:08:33 cgd Exp $
+#
+# Generic Alpha kernel. Enough to get booted, etc., but not much more.
+
+include "arch/alpha/conf/std.alpha"
+
+maxusers 8
+
+# Always include profiling support; does not need 'config -p'.
+makeoptions PROF="-pg"
+options GPROF
+
+# CPU Support
+options DEC_3000_500 # Flamingo etc: 3000/[4-9]00*
+options DEC_3000_300 # Pelican etc: 3000/300*
+options DEC_2100_A50 # Avanti etc: AlphaStation 400, 200, etc.
+options DEC_KN20AA # KN20AA: AlphaStation 600
+options DEC_AXPPCI_33 # NoName: AXPpci33, etc.
+#options DEC_2000_300 # "Jensen": 2000/300 (DECpc AXP 150)
+
+# needs to be set per system
+options TIMEZONE="5*60" # Minutes west of GMT (for param.c)
+options DST=1 # Daylight savings rules (for param.c)
+
+# Standard system options
+options SWAPPAGER, DEVPAGER # Paging (mandatory)
+options DEBUG, DIAGNOSTIC # Extra kernel debugging
+options KTRACE # System call tracing support
+
+# File system options
+options FIFO # POSIX fifo support (in all file systems)
+options FFS # Fast file system
+options MFS # Memory-based file system
+options NFSSERVER # Sun NFS-compatible file system server
+options NFSCLIENT # Sun NFS-compatible file system client
+
+# Networking options
+options INET # Internet protocol suite
+
+# 4.3BSD compatibility. Should be optional, but necessary for now.
+options COMPAT_43
+
+# Binary compatibility with previous versions of NetBSD.
+#options COMPAT_09
+options COMPAT_10
+options COMPAT_11
+options COMPAT_12
+
+# OSF/1 binary compatibility -- CURRENTLY DOES NOT WORK
+#options COMPAT_OSF1
+
+# Loadable Kernel Modules
+options LKM
+
+# Disable kernel security.
+#options INSECURE
+
+# Misc. options
+options EISAVERBOSE # recognize "unknown" EISA devices
+options PCIVERBOSE # recognize "unknown" PCI devices
+options TCVERBOSE # recognize "unknown" TC devices
+options UCONSOLE # users can use TIOCCONS (for xconsole)
+
+config bsd swap generic
+#config bsd root on sd0 swap on sd0
+#config bsd root nfs swap nfs
+
+mainbus0 at root
+cpu* at mainbus0
+
+# TurboChannel host bus adapter support
+tcasic* at mainbus0
+
+# TurboChannel bus support
+tc* at tcasic?
+
+# TurboChannel devices
+ioasic0 at tc? slot ? offset ?
+mcclock0 at ioasic? offset ?
+le* at ioasic? offset ?
+scc0 at ioasic? offset ?
+scc1 at ioasic? offset ?
+tcds0 at tc? slot ? offset ?
+esp0 at tcds? slot ?
+esp1 at tcds? slot ?
+cfb* at tc? slot ? offset ?
+sfb* at tc? slot ? offset ?
+le* at tc? slot ? offset ?
+fta* at tc? slot ? offset ? # DEC DEFTA FDDI cards
+
+# PCI host bus adapter support
+apecs* at mainbus?
+cia* at mainbus?
+lca* at mainbus?
+
+# PCI bus support
+pci* at apecs?
+pci* at cia?
+pci* at lca?
+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)
+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)
+ncr* at pci? dev ? function ? # NCR 53c8xx SCSI
+pceb* at pci? dev ? function ? # Intel PCI-EISA brige
+pcivga* at pci? dev ? function ? # PCI VGA graphics
+ppb* at pci? dev ? function ? # PCI-PCI bridges
+sio* at pci? dev ? function ? # Intel PCI-ISA bridge
+tga* at pci? dev ? function ? # DEC ZLXp-E[123] graphics
+
+# ISA/EISA bus support
+isa* at pceb?
+eisa* at pceb?
+isa* at sio?
+
+# ISA devices
+mcclock0 at isa? port 0x70
+pckbd0 at isa? port 0x60 irq 1 # PC-ish ISA keyboard
+pms0 at isa? port 0x60 irq 12 # PS/2 auxiliary
+com0 at isa? port 0x3f8 irq 4 # standard serial ports
+com1 at isa? port 0x2f8 irq 3
+lpt0 at isa? port 0x3bc irq 7 # standard parallel port
+#wss0 at isa? port 0x530 irq 9 drq 0 # Windows Sound System
+
+# EISA devices
+fea* at eisa? slot ? # DEC DEFEA FDDI cards
+
+# SCSI bus support
+scsibus* at esp?
+scsibus* at ncr?
+
+# SCSI devices
+sd* at scsibus? target ? lun ?
+st* at scsibus? target ? lun ?
+cd* at scsibus? target ? lun ?
+
+# Workstation Console attachments
+wscons* at cfb?
+wscons* at pcivga?
+wscons* at sfb?
+wscons* at tga?
+
+pseudo-device bpfilter 16
+pseudo-device loop
+pseudo-device pty 64
+pseudo-device sl 4
+pseudo-device vnd 4
diff --git a/sys/arch/alpha/conf/JURA b/sys/arch/alpha/conf/JURA
index de3ab57d1e4..fd66de8e82d 100644
--- a/sys/arch/alpha/conf/JURA
+++ b/sys/arch/alpha/conf/JURA
@@ -1,11 +1,11 @@
-# $OpenBSD: JURA,v 1.6 1996/09/20 06:44:51 deraadt Exp $
-# $NetBSD: JURA,v 1.6.4.1 1996/06/13 19:22:10 cgd Exp $
+# $OpenBSD: JURA,v 1.7 1996/10/30 22:38:40 niklas Exp $
+# $NetBSD: JURA,v 1.9 1996/09/27 17:08:34 cgd Exp $
#
# Kernel for jura.pdl.cs.cmu.edu.
#
# THIS KERNEL DOES NOT CURRENTLY WORK, OR EVEN CONFIGURE!
-include "std.alpha"
+include "arch/alpha/conf/std.alpha"
maxusers 8
@@ -39,6 +39,7 @@ options COMPAT_43
#options COMPAT_09
options COMPAT_10
options COMPAT_11
+options COMPAT_12
# Loadable Kernel Modules
options LKM
diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index 26f39dcae83..68f5a96b5cf 100644
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile.alpha,v 1.7 1996/07/29 20:01:25 niklas Exp $
-# $NetBSD: Makefile.alpha,v 1.16 1996/05/19 21:16:51 cgd Exp $
+# $OpenBSD: Makefile.alpha,v 1.8 1996/10/30 22:38:41 niklas Exp $
+# $NetBSD: Makefile.alpha,v 1.25 1996/09/27 17:33:04 cgd Exp $
-# Makefile for NetBSD
+# Makefile for OpenBSD
#
# This makefile is constructed from a machine description:
# config machineid
@@ -22,22 +22,32 @@
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
-AS?= as
CC?= cc
-CPP?= cpp
LD?= ld
-STRIP?= strip -g -X -x
-TOUCH?= touch -f -c
+MKDEP?= mkdep
+STRIP?= strip
# source tree is located via $S relative to the compilation directory
-S= ../../../..
-ALPHA= ../..
+.ifndef S
+S!= cd ../../../..; pwd
+.endif
+ALPHA= $S/arch/alpha
+
+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
-INCLUDES= -I. -I$S/arch -I$S
-CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL -Dalpha
-CFLAGS= ${DEBUG} -O2 -Werror -mno-fp-regs
-AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE
+CMACHFLAGS= -mno-fp-regs
+CFLAGS= ${DEBUG} -O2 ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS}
+AFLAGS= -traditional -D_LOCORE
LINKFLAGS= -N -Ttext fffffc0000230000 -e __start -G 4
+STRIPFLAGS= -g -X -x
+
+HOSTED_CC= ${CC}
+HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//}
+HOSTED_CFLAGS= ${CFLAGS}
### find out what to use for libkern
.include "$S/lib/libkern/Makefile.inc"
@@ -55,19 +65,13 @@ LIBCOMPAT= ${COMPATLIB}
LIBCOMPAT= ${COMPATLIB_PROF}
.endif
-# compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
-# where TYPE is NORMAL, DRIVER, or PROFILE}; SUFFIX is the file suffix,
-# capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
-# is marked as config-dependent.
+# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
+# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
NORMAL_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NORMAL_C_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
-
-DRIVER_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-DRIVER_C_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
+NORMAL_S= ${CPP} ${AFLAGS} ${CPPFLAGS} $< | sed -e 's,^\#.*,,' | ${AS} -o ${.TARGET}
-NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
-NORMAL_S_C= ${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $<
+HOSTED_C= ${HOSTED_CC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $<
%OBJS
@@ -93,9 +97,9 @@ DEBUG?=
LINKFLAGS+= -X
SYSTEM_LD_TAIL+=; \
echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
- echo ${STRIP} $@; ${STRIP} $@
+ echo ${STRIP} ${STRIPFLAGS} $@; ${STRIP} ${STRIPFLAGS} $@
.else
-LINKFLAGS+= -x
+LINKFLAGS+= -S
.endif
%LOAD
@@ -107,14 +111,14 @@ genassym: genassym.o
${CC} -o $@ genassym.o
genassym.o: ${ALPHA}/alpha/genassym.c
- ${NORMAL_C_C}
+ ${HOSTED_C}
param.c: $S/conf/param.c
rm -f param.c
cp $S/conf/param.c .
param.o: param.c Makefile
- ${NORMAL_C_C}
+ ${NORMAL_C}
ioconf.o: ioconf.c
${NORMAL_C}
@@ -125,11 +129,11 @@ newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
clean::
- rm -f eddep *bsd netbsd.gdb tags *.[io] [a-z]*.s \
+ rm -f eddep *bsd bsd.gdb tags *.[io] [a-z]*.s \
[Ee]rrs linterrs makelinks genassym genassym.o assym.h
lint:
- @lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
+ @lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \
${ALPHA}/alpha/Locore.c ${CFILES} ${ALPHA}/alpha/swapgeneric.c \
ioconf.c param.c | \
grep -v 'static function .* unused'
@@ -149,10 +153,11 @@ SRCS= ${ALPHA}/alpha/locore.s \
param.c ioconf.c ${CFILES} ${SFILES}
depend:: .depend
.depend: ${SRCS} assym.h param.c
- mkdep ${AFLAGS} ${CPPFLAGS} ${ALPHA}/alpha/locore.s
- mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
- mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
- mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${ALPHA}/alpha/genassym.c
+ ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${ALPHA}/alpha/locore.s
+ ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
+ ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
+ ${MKDEP} -a ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} \
+ ${ALPHA}/alpha/genassym.c
# depend on root or device configuration
diff --git a/sys/arch/alpha/conf/NOSY b/sys/arch/alpha/conf/NOSY
index 5fddc1c81e5..61eddd751eb 100644
--- a/sys/arch/alpha/conf/NOSY
+++ b/sys/arch/alpha/conf/NOSY
@@ -1,10 +1,10 @@
-# $OpenBSD: NOSY,v 1.4 1996/09/20 06:44:51 deraadt Exp $
-# $NetBSD: NOSY,v 1.5.4.2 1996/06/13 19:22:15 cgd Exp $
+# $OpenBSD: NOSY,v 1.5 1996/10/30 22:38:42 niklas Exp $
+# $NetBSD: NOSY,v 1.9 1996/09/27 17:08:34 cgd Exp $
#
# Jason's DEC 3000/400 in the lab...
#
-include "std.alpha"
+include "arch/alpha/conf/std.alpha"
maxusers 8
@@ -38,6 +38,7 @@ options COMPAT_43
#options COMPAT_09
options COMPAT_10
options COMPAT_11
+options COMPAT_12
# OSF/1 binary compatibility -- CURRENTLY DOES NOT WORK
#options COMPAT_OSF1
diff --git a/sys/arch/alpha/conf/OPAL b/sys/arch/alpha/conf/OPAL
index af1be26d67e..43440918adb 100644
--- a/sys/arch/alpha/conf/OPAL
+++ b/sys/arch/alpha/conf/OPAL
@@ -1,8 +1,8 @@
-# $OpenBSD: OPAL,v 1.3 1996/09/20 06:44:52 deraadt Exp $
+# $OpenBSD: OPAL,v 1.4 1996/10/30 22:38:43 niklas Exp $
#
# OPAL, kernel for a DEC Multia at Applitron
-include "std.alpha"
+include "arch/alpha/conf/std.alpha"
maxusers 8
@@ -25,9 +25,9 @@ option FFS # Fast file system
option MFS # Memory-based file system
option NFSSERVER # Sun NFS-compatible file system server
option NFSCLIENT # Sun NFS-compatible file system client
-option NULLFS # Loopback file system
+#option NULLFS # Loopback file system
#option MSDOSFS # MS-DOS file system
-option UNION # Union file system
+#option UNION # Union file system
option CD9660 # ISO 9660 + Rock Ridge file system
# SVR IPC
@@ -45,6 +45,7 @@ option COMPAT_43
#option COMPAT_09
option COMPAT_10
option COMPAT_11
+option COMPAT_12
# OSF/1 binary compatibility -- CURRENTLY DOES NOT WORK
option COMPAT_OSF1
@@ -151,3 +152,4 @@ pseudo-device loop
pseudo-device pty 64
pseudo-device sl 4
pseudo-device vnd 4
+pseudo-device rd 1
diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK
new file mode 100644
index 00000000000..115116e2ad4
--- /dev/null
+++ b/sys/arch/alpha/conf/RAMDISK
@@ -0,0 +1,154 @@
+# $OpenBSD: RAMDISK,v 1.1 1996/10/30 22:38:44 niklas Exp $
+# $NetBSD: RAMDISK,v 1.4 1996/10/03 20:47:19 cgd Exp $
+#
+# Generic Alpha kernel. Enough to get booted, etc., but not much more.
+
+include "arch/alpha/conf/std.alpha"
+
+maxusers 8
+
+# CPU Support
+options DEC_3000_500 # Flamingo etc: 3000/[4-9]00*
+options DEC_3000_300 # Pelican etc: 3000/300*
+options DEC_2100_A50 # Avanti etc: AlphaStation 400, 200, etc.
+options DEC_KN20AA # KN20AA: AlphaStation 600
+options DEC_AXPPCI_33 # NoName: AXPpci33, etc.
+#options DEC_2000_300 # "Jensen": 2000/300 (DECpc AXP 150)
+
+# Enable the hooks used for initializing the ram-disk.
+options RAMDISK_HOOKS
+options MINIROOTSIZE=8192 # 4 Megabytes!
+
+# needs to be set per system
+options TIMEZONE="5*60" # Minutes west of GMT (for param.c)
+options DST=1 # Daylight savings rules (for param.c)
+
+# Standard system options
+options SWAPPAGER, DEVPAGER # Paging (mandatory)
+options DEBUG, DIAGNOSTIC # Extra kernel debugging
+options KTRACE # System call tracing support
+
+# File system options
+options FIFO # POSIX fifo support (in all file systems)
+options FFS # Fast file system
+options MFS # Memory-based file system
+options NFSSERVER # Sun NFS-compatible file system server
+options NFSCLIENT # Sun NFS-compatible file system client
+
+# Networking options
+options INET # Internet protocol suite
+
+# 4.3BSD compatibility. Should be optional, but necessary for now.
+options COMPAT_43
+
+# Binary compatibility with previous versions of NetBSD.
+#options COMPAT_09
+options COMPAT_10
+options COMPAT_11
+options COMPAT_12
+
+# OSF/1 binary compatibility -- CURRENTLY DOES NOT WORK
+#options COMPAT_OSF1
+
+# Loadable Kernel Modules
+options LKM
+
+# Disable kernel security.
+#options INSECURE
+
+# Misc. options
+options EISAVERBOSE # recognize "unknown" EISA devices
+options PCIVERBOSE # recognize "unknown" PCI devices
+options TCVERBOSE # recognize "unknown" TC devices
+options UCONSOLE # users can use TIOCCONS (for xconsole)
+
+config bsd swap generic
+#config bsd root on sd0 swap on sd0
+#config bsd root nfs swap nfs
+
+mainbus0 at root
+cpu* at mainbus0
+
+# TurboChannel host bus adapter support
+tcasic* at mainbus0
+
+# TurboChannel bus support
+tc* at tcasic?
+
+# TurboChannel devices
+ioasic0 at tc? slot ? offset ?
+mcclock0 at ioasic? offset ?
+le* at ioasic? offset ?
+scc0 at ioasic? offset ?
+scc1 at ioasic? offset ?
+tcds0 at tc? slot ? offset ?
+esp0 at tcds? slot ?
+esp1 at tcds? slot ?
+cfb* at tc? slot ? offset ?
+sfb* at tc? slot ? offset ?
+le* at tc? slot ? offset ?
+fta* at tc? slot ? offset ? # DEC DEFTA FDDI cards
+
+# PCI host bus adapter support
+apecs* at mainbus?
+cia* at mainbus?
+lca* at mainbus?
+
+# PCI bus support
+pci* at apecs?
+pci* at cia?
+pci* at lca?
+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)
+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)
+ncr* at pci? dev ? function ? # NCR 53c8xx SCSI
+pceb* at pci? dev ? function ? # Intel PCI-EISA brige
+pcivga* at pci? dev ? function ? # PCI VGA graphics
+ppb* at pci? dev ? function ? # PCI-PCI bridges
+sio* at pci? dev ? function ? # Intel PCI-ISA bridge
+tga* at pci? dev ? function ? # DEC ZLXp-E[123] graphics
+
+# ISA/EISA bus support
+isa* at pceb?
+eisa* at pceb?
+isa* at sio?
+
+# ISA devices
+mcclock0 at isa? port 0x70
+pckbd0 at isa? port 0x60 irq 1 # PC-ish ISA keyboard
+pms0 at isa? port 0x60 irq 12 # PS/2 auxiliary
+com0 at isa? port 0x3f8 irq 4 # standard serial ports
+com1 at isa? port 0x2f8 irq 3
+lpt0 at isa? port 0x3bc irq 7 # standard parallel port
+#wss0 at isa? port 0x530 irq 9 drq 0 # Windows Sound System
+
+# EISA devices
+fea* at eisa? slot ? # DEC DEFEA FDDI cards
+
+# SCSI bus support
+scsibus* at esp?
+scsibus* at ncr?
+
+# SCSI devices
+sd* at scsibus? target ? lun ?
+st* at scsibus? target ? lun ?
+cd* at scsibus? target ? lun ?
+
+# Workstation Console attachments
+wscons* at cfb?
+wscons* at pcivga?
+wscons* at sfb?
+wscons* at tga?
+
+pseudo-device bpfilter 16
+pseudo-device loop
+pseudo-device pty 64
+pseudo-device sl 4
+pseudo-device vnd 4
+pseudo-device rd 1
diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha
index e8dc3b51654..8df2ea1b219 100644
--- a/sys/arch/alpha/conf/files.alpha
+++ b/sys/arch/alpha/conf/files.alpha
@@ -1,9 +1,9 @@
-# $OpenBSD: files.alpha,v 1.5 1996/07/29 20:01:27 niklas Exp $
-# $NetBSD: files.alpha,v 1.19.4.2 1996/05/30 23:20:37 cgd Exp $
+# $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 $
#
# alpha-specific configuration info
-# maxpartitions must be first item in files.${ARCH}.newconf
+# maxpartitions must be first item in files.${ARCH}
maxpartitions 8
maxusers 2 8 64
@@ -25,18 +25,23 @@ file arch/alpha/alpha/cpu.c cpu
# Machine-independent SCSI drivers
#
-include "../../../scsi/files.scsi"
+include "scsi/files.scsi"
major { st = 2 }
major { cd = 3 }
major { sd = 8 }
+# RAM Disk
+pseudo-device rd
+file dev/ramdisk.c rd needs-flag
+file arch/alpha/alpha/rd_root.c ramdisk_hooks
+major { rd = 6 }
#
# raster console routines
#
define raster
-include "../../../dev/rcons/files.rcons"
+include "dev/rcons/files.rcons"
file arch/alpha/wscons/wscons_rinit.c raster
file arch/alpha/wscons/wscons_rops.c raster
@@ -59,7 +64,7 @@ file arch/alpha/wscons/ms.c wscons
# TurboChannel Devices
#
-include "../../../dev/tc/files.tc"
+include "dev/tc/files.tc"
device tcasic: tcbus
attach tcasic at mainbus
@@ -114,13 +119,13 @@ file dev/tc/if_le_tc.c le_tc
#
# Machine-independent ATAPI drivers
#
-include "../../../dev/atapi/files.atapi"
+include "dev/atapi/files.atapi"
# XXX Dummy bus needed for some multi-homed devices specified in files.isa
define pcmcia {}
-include "../../../dev/pci/files.pci" # XXX some ISA devs are 'at pci' too.
-include "../../../dev/isa/files.isa"
+include "dev/pci/files.pci" # XXX some ISA devs are 'at pci' too.
+include "dev/isa/files.isa"
#file arch/alpha/isa/isafcns_jensen.c dec_2000_300
@@ -145,14 +150,14 @@ file arch/alpha/isa/pms.c pms needs-flag
# EISA Bus support
#
-include "../../../dev/eisa/files.eisa"
+include "dev/eisa/files.eisa"
#
# PCI Bus support
#
-# include "../../../dev/pci/files.pci" XXX SEE ABOVE
+# include "dev/pci/files.pci" XXX SEE ABOVE
device apecs: pcibus
attach apecs at mainbus
@@ -227,10 +232,11 @@ file arch/alpha/alpha/interrupt.c
file arch/alpha/alpha/machdep.c
file arch/alpha/alpha/mainbus.c
file arch/alpha/alpha/mem.c
-file arch/alpha/alpha/pmap.c
+file arch/alpha/alpha/pmap.c new_pmap
+file arch/alpha/alpha/pmap.old.c !new_pmap
file arch/alpha/alpha/process_machdep.c
file arch/alpha/alpha/prom.c
-file arch/alpha/alpha/support.c
+#file arch/alpha/alpha/support.c
file arch/alpha/alpha/sys_machdep.c
file arch/alpha/alpha/trap.c
file arch/alpha/alpha/vm_machdep.c
@@ -242,7 +248,8 @@ file dev/cons.c
# Optional/miscellaneous files
#
-file arch/alpha/alpha/in_cksum.c inet
+file arch/alpha/alpha/in_cksum.c inet & !generic_in_cksum
+file netinet/in_cksum.c inet & generic_in_cksum
file netns/ns_cksum.c ns
# XXX
@@ -257,4 +264,4 @@ file arch/alpha/alpha/dec_axppci_33.c dec_axppci_33
file arch/alpha/alpha/dec_21000.c dec_21000
# OSF/1 Binary Compatibility (COMPAT_OSF1)
-include "../../../compat/osf1/files.osf1"
+include "compat/osf1/files.osf1"
diff --git a/sys/arch/alpha/conf/std.alpha b/sys/arch/alpha/conf/std.alpha
index a81b37efa17..21d789851c8 100644
--- a/sys/arch/alpha/conf/std.alpha
+++ b/sys/arch/alpha/conf/std.alpha
@@ -1,10 +1,13 @@
-# $OpenBSD: std.alpha,v 1.2 1996/07/29 20:01:27 niklas Exp $
-# $NetBSD: std.alpha,v 1.4 1995/11/25 01:34:38 cgd Exp $
+# $OpenBSD: std.alpha,v 1.3 1996/10/30 22:38:46 niklas Exp $
+# $NetBSD: std.alpha,v 1.8 1996/09/27 17:18:02 cgd Exp $
#
# Standard/required configuration info for OpenBSD/alpha.
machine alpha
makeoptions DEBUG="-g"
+#makeoptions CWARNFLAGS="-Werror"
options EXEC_ECOFF
+options EXEC_ELF64
+options EXEC_SCRIPT