diff options
Diffstat (limited to 'sys/arch/hp300/conf')
| -rw-r--r-- | sys/arch/hp300/conf/DISKLESS | 7 | ||||
| -rw-r--r-- | sys/arch/hp300/conf/GENERIC | 7 | ||||
| -rw-r--r-- | sys/arch/hp300/conf/Makefile.hp300 | 58 | ||||
| -rw-r--r-- | sys/arch/hp300/conf/NEWCONFIG | 148 | ||||
| -rw-r--r-- | sys/arch/hp300/conf/files.hp300 | 186 | ||||
| -rw-r--r-- | sys/arch/hp300/conf/files.hp300.oldconf | 8 | ||||
| -rw-r--r-- | sys/arch/hp300/conf/std.hp300 | 17 |
7 files changed, 396 insertions, 35 deletions
diff --git a/sys/arch/hp300/conf/DISKLESS b/sys/arch/hp300/conf/DISKLESS index 58e4791aeb2..24cd82c4969 100644 --- a/sys/arch/hp300/conf/DISKLESS +++ b/sys/arch/hp300/conf/DISKLESS @@ -1,4 +1,5 @@ -# $NetBSD: DISKLESS,v 1.5 1995/12/29 17:12:50 thorpej Exp $ +# $OpenBSD: DISKLESS,v 1.8 1997/01/12 15:12:13 downsj Exp $ +# $NetBSD: DISKLESS,v 1.11 1996/12/11 09:10:38 thorpej Exp $ # # Diskless HP 9000/300-series workstation. # @@ -50,6 +51,8 @@ options NMBCLUSTERS="512" # Just a little extra options FPSP # floating point interface for 68040 options USELEDS # make the lights twinkle #options PANICBUTTON # two fast <reset>s on HIL dump kernel +options UK_KEYBOARD # include United Kingdom HIL keymap +options SE_KEYBOARD # include Swedish HIL keymap # # HP-UX binary compatibility. @@ -57,6 +60,8 @@ options USELEDS # make the lights twinkle # options COMPAT_HPUX # HP-UX binary compatibility +#options "COMPAT_M68K4K" # compat. with NetBSD/m68k4k binaries + # Debugging options options DDB # Kernel Dynamic Debugger diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC index a1810cabe53..1719102e1a0 100644 --- a/sys/arch/hp300/conf/GENERIC +++ b/sys/arch/hp300/conf/GENERIC @@ -1,4 +1,5 @@ -# $NetBSD: GENERIC,v 1.9 1996/02/24 00:54:53 thorpej Exp $ +# $OpenBSD: GENERIC,v 1.10 1997/01/12 15:12:13 downsj Exp $ +# $NetBSD: GENERIC,v 1.16 1996/12/11 09:10:40 thorpej Exp $ # # Generic kernel - one size fits all. # @@ -56,6 +57,8 @@ options USELEDS # make the lights twinkle options COMPAT_NOLABEL # defaults for unlabeled disks #options PANICBUTTON # two fast <reset>s on HIL dump kernel #options CONSCODE="9" # force console at this select code +options UK_KEYBOARD # include United Kingdom HIL keymap +options SE_KEYBOARD # include Swedish HIL keymap # # HP-UX binary compatibility. @@ -66,8 +69,6 @@ options COMPAT_HPUX # HP-UX binary compatibility # Debugging options options DDB # Kernel Dynamic Debugger -# If the kernel isn't named `GENERIC', uncomment the line below. -#options GENERIC # Generic swap support config bsd swap generic master hpib0 at scode7 diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300 index 60e1d4ad7b6..25db7e22268 100644 --- a/sys/arch/hp300/conf/Makefile.hp300 +++ b/sys/arch/hp300/conf/Makefile.hp300 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile.hp300,v 1.39 1996/05/11 16:12:02 mycroft Exp $ +# $OpenBSD: Makefile.hp300,v 1.10 1997/01/12 15:12:14 downsj Exp $ +# $NetBSD: Makefile.hp300,v 1.45 1996/12/01 06:12:30 jonathan Exp $ -# Makefile for NetBSD +# Makefile for OpenBSD # # This makefile is constructed from a machine description: # config machineid @@ -21,22 +22,28 @@ # DEBUG is set to -g if debugging. # PROF is set to -pg if profiling. -AS?= as CC?= cc -CPP?= cpp LD?= ld -STRIP?= strip -d -TOUCH?= touch -f -c +MKDEP?= mkdep +STRIP?= strip +COPTS?= -O2 # source tree is located via $S relative to the compilation directory S= ../../../.. HP300= ../.. -INCLUDES= -I. -I$S/arch -I$S -CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Dhp300 -DFPCOPROC -CFLAGS= ${DEBUG} -O2 -Werror -msoft-float +INCLUDES= -I. -I$S/arch -I$S -nostdinc +CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \ + -Dmc68020 -Dhp300 -DFPCOPROC +CWARNFLAGS= -Werror +CFLAGS= ${DEBUG} ${COPTS} ${CWARNFLAGS} -msoft-float AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE LINKFLAGS= -n -Ttext 0 -e start +STRIPFLAGS= -d + +HOSTED_CC= ${CC} +HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//} +HOSTED_CFLAGS= ${CFLAGS} ### find out what to use for libkern .include "$S/lib/libkern/Makefile.inc" @@ -57,19 +64,13 @@ LIBCOMPAT= ${COMPATLIB_PROF} ### for the Motorola 68040 Floating Point Software Product .include "$S/arch/m68k/fpsp/Makefile.inc" -# 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= ${CC} ${AFLAGS} ${CPPFLAGS} -c $< -NORMAL_S_C= ${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $< + +HOSTED_C= ${HOSTED_CC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $< %OBJS @@ -95,9 +96,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 @@ -109,14 +110,14 @@ genassym: genassym.o ${CC} -o $@ genassym.o genassym.o: ${HP300}/hp300/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} @@ -131,7 +132,7 @@ clean:: [Ee]rrs linterrs makelinks genassym genassym.o assym.h lint: - @lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \ + @lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \ ${HP300}/hp300/Locore.c ${CFILES} ${HP300}/hp300/swapgeneric.c \ ioconf.c param.c | \ grep -v 'static function .* unused' @@ -151,12 +152,13 @@ SRCS= ${HP300}/hp300/locore.s \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c - mkdep ${AFLAGS} ${CPPFLAGS} ${HP300}/hp300/locore.s - mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${HP300}/hp300/locore.s + ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} -if test -n "${SFILES}"; then \ - mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}; \ + ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}; \ fi - mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${HP300}/hp300/genassym.c + ${MKDEP} -a ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} \ + ${HP300}/hp300/genassym.c # depend on root or device configuration diff --git a/sys/arch/hp300/conf/NEWCONFIG b/sys/arch/hp300/conf/NEWCONFIG new file mode 100644 index 00000000000..7c0344eea65 --- /dev/null +++ b/sys/arch/hp300/conf/NEWCONFIG @@ -0,0 +1,148 @@ +# $OpenBSD: NEWCONFIG,v 1.1 1997/01/12 15:12:14 downsj Exp $ +# $NetBSD: NEWCONFIG,v 1.1 1996/12/17 08:40:56 thorpej Exp $ +# +# "Generic" kernel for new-style config. +# + +# Include attributes common to all hp300s +include "arch/hp300/conf/std.hp300" + +# Support for various CPU types +options HP320 +options HP330 # includes 318, 319 +options HP340 +options HP350 +options HP360 +options HP370 +options HP375 # includes 345, 400t, 400s +options HP380 # includes 425t, 425s, 433s + +# Need to set locally +maxusers 32 + +# Standard system options +options COMPAT_43 # compatibility with 4.3BSD interfaces +options COMPAT_44 # compatibility with 4.4BSD binaries +options COMPAT_09 # compatibility with NetBSD 0.9 +options COMPAT_10 # compatibility with NetBSD 1.0 +options COMPAT_11 # compatibility with NetBSD 1.1 +options COMPAT_12 # compatibility with NetBSD 1.2 +options SYSVSHM # System V-style shared memory +options SYSVSEM # System V-style semaphores +options SYSVMSG # System V-style message queues +options KTRACE # system call tracing support +options "NKMEMCLUSTERS=1024" # # 4K pages in kernel malloc pool + +# Filesystem options +options FIFO # POSIX fifo support (in all filesystems) +options FFS,QUOTA # fast filesystem with user and group quotas +options CD9660 # CD-ROM ISO-9660 filesystem +options NFSSERVER # Network filesystem server +options NFSCLIENT # Network filesystem client +options UNION # Union filesystem (req. for FDESC) +options KERNFS # kernel data-structure filesystem +options FDESC # user file descriptor filesystem +options PROCFS # /proc filesystem +options MFS # Memory-based filesystem + +# Networking options +options INET # Internet protocols +options GATEWAY # IP forwarding + larger mb_map +options MROUTING # Multicast routing +options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP + +# Options for HP hardware +options FPSP # floating point interface for 68040 +options USELEDS # make the lights twinkle +options COMPAT_NOLABEL # defaults for unlabeled disks +#options PANICBUTTON # two fast <reset>s on HIL dump kernel +#options CONSCODE="9" # force console at this select code +options UK_KEYBOARD # include United Kingdom HIL keymap +options SE_KEYBOARD # include Swedish HIL keymap + +# This option enables a different copyin/copyout that uses page +# mapping for large copies. +#options MAPPEDCOPY # different copyin/copyout for large copies + +# +# HP-UX binary compatibility. +# NOTE: THIS IS STILL VERY EXPERIMENTAL. YOUR MILEAGE MAY VARY. +# +options COMPAT_HPUX # HP-UX binary compatibility + +options COMPAT_M68K4K # compat. with NetBSD/m68k4k binaries + +# Debugging options +options DIAGNOSTIC # Extra kernel sanity checks +#options DEBUG # Enable misc. kernel debugging code +options DDB # Kernel Dynamic Debugger + +config netbsd swap generic + +mainbus0 at root # root "bus" + +intio0 at mainbus0 # internal i/o space +dio0 at mainbus0 # DIO/DIO-II bus + +# Davinci framebuffer +dvbox* at intio? +dvbox* at dio? scode ? + +# Gatorbox framebuffer +gbox* at intio? +gbox* at dio? scode ? + +# Hyperion framebuffer +hyper* at dio? scode ? + +# Renaissance framebuffer +rbox* at intio? +rbox* at dio? scode ? + +# Topcat/catseye framebuffers +topcat* at intio? +topcat* at dio? scode ? + +# Framebuffer abstraction +grf* at dvbox? +grf* at gbox? +grf* at hyper? +grf* at rbox? +grf* at topcat? + +# Internal Terminal Emulator +ite* at grf? + +dca0 at dio? scode 9 flags 1 # DCA serial interfaces +dca* at dio? scode ? + +dcm* at dio? scode ? flags 0xe # DCM 4- or 8-port serial interfaces + +le* at dio? scode ? # LANCE ethernet interfaces + +#nhpib0 at dio? scode 7 # slow internal HP-IB +#nhpib* at dio? scode ? + +#fhpib* at dio? scode ? # `fast' HP-IB + +#hpibbus* at nhpib? +#hpibbus* at fhpib? + +#rd* at hpibbus? slave ? punit ? # HP-IB disks +#ct* at hpibbus? slave ? punit ? # HP-IB cartridge tapes +#mt* at hpibbus? slave ? punit ? # HP-IB 9-track tape +#ppi0 at hpibbus0 slave 5 punit 0 # HP-IB plotter + +#oscsi* at dio? scode ? # Old HP SCSI + +#sd* at oscsi? target ? lun ? # SCSI disks +#st* at oscsi? target ? lun ? # SCSI tapes +#ac* at oscsi? target ? lun ? # SCSI changers + +pseudo-device pty 64 # pseudo ptys +pseudo-device sl 4 # SLIP network interfaces +pseudo-device ppp 4 # PPP network interfaces +pseudo-device bpfilter 16 # Berkeley packet filter +pseudo-device vnd 4 # vnode pseudo-disks +pseudo-device ccd 4 # concatenated disk devices +pseudo-device loop # loopback network interface diff --git a/sys/arch/hp300/conf/files.hp300 b/sys/arch/hp300/conf/files.hp300 new file mode 100644 index 00000000000..0c00099075e --- /dev/null +++ b/sys/arch/hp300/conf/files.hp300 @@ -0,0 +1,186 @@ +# $OpenBSD: files.hp300,v 1.1 1997/01/12 15:12:15 downsj Exp $ +# $NetBSD: files.hp300,v 1.20 1996/12/17 08:40:57 thorpej Exp $ +# +# hp300-specific configuration info + +# maxpartitions must be the first item in files.${ARCH} +maxpartitions 8 + +maxusers 2 8 64 + +# NOTE! The order of these lines is significant! Don't change them +# unless you absolutely know what you're doing! + +# Frame buffer attribute +define grfdev { } + +# Frame buffer devices +device dvbox: grfdev +file arch/hp300/dev/grf_dv.c dvbox needs-flag + +device gbox: grfdev +file arch/hp300/dev/grf_gb.c gbox needs-flag + +device hyper: grfdev +file arch/hp300/dev/grf_hy.c hyper needs-flag + +device rbox: grfdev +file arch/hp300/dev/grf_rb.c rbox needs-flag + +device topcat: grfdev +file arch/hp300/dev/grf_tc.c topcat needs-flag + +# `grf' framebuffer abstraction +device grf { } +attach grf at grfdev +file arch/hp300/dev/grf.c grf needs-flag +file arch/hp300/dev/grf_subr.c grf + +# Internal Terminal Emulator +device ite +attach ite at grf +file arch/hp300/dev/ite.c ite needs-flag +file arch/hp300/dev/ite_subr.c ite + +# +# Mainbus +# + +device mainbus { } +attach mainbus at root + +# +# Internal i/o space +# + +device intio { } +attach intio at mainbus +file arch/hp300/dev/intio.c intio + +# Internal i/o framebuffer attachments +attach dvbox at intio with dvbox_intio +attach gbox at intio with gbox_intio +attach rbox at intio with rbox_intio +attach topcat at intio with topcat_intio + +# +# DIO bus +# + +device dio { scode = -1 } +attach dio at mainbus +file arch/hp300/dev/dio.c dio + +# DIO framebuffer attachments +attach dvbox at dio with dvbox_dio +attach gbox at dio with gbox_dio +attach hyper at dio with hyper_dio +attach rbox at dio with rbox_dio +attach topcat at dio with topcat_dio + +# DCA serial interface +device dca: tty +attach dca at dio +file arch/hp300/dev/dca.c dca needs-flag + +# DCM serial interface +device dcm: tty +attach dcm at dio +file arch/hp300/dev/dcm.c dcm needs-flag + +# LANCE ethernet +attach le at dio +file arch/hp300/dev/if_le.c le + +# HP-IB interfaces +define hpibdev { } + +device nhpib: hpibdev +attach nhpib at dio +file arch/hp300/dev/nhpib.c nhpib + +device fhpib: hpibdev +attach fhpib at dio +file arch/hp300/dev/fhpib.c fhpib + +# HP-IB bus layer +device hpibbus { slave = -1, punit = -1 } +attach hpibbus at hpibdev +file arch/hp300/dev/hpib.c hpibbus + +# HP-IB devices +device ct: tape +attach ct at hpibbus +file arch/hp300/dev/ct.c ct needs-flag + +device mt: tape +attach mt at hpibbus +file arch/hp300/dev/mt.c mt needs-flag + +device rd: disk +attach rd at hpibbus +file arch/hp300/dev/rd.c rd needs-flag +file arch/hp300/dev/rd_compat.c rd # XXX + +device ppi +attach ppi at hpibbus +file arch/hp300/dev/ppi.c ppi needs-flag + +# Old HP SCSI layer +device oscsi { target = -1, lun = -1 } +attach oscsi at dio +file arch/hp300/dev/scsi.c scsi + +# Old HP SCSI devices +device sd: disk +attach sd at oscsi +file arch/hp300/dev/sd.c sd needs-flag +file arch/hp300/dev/sd_compat.c sd # XXX + +device st: tape +attach st at oscsi +file arch/hp300/dev/st.c st needs-flag + +device ac +attach ac at oscsi +file arch/hp300/dev/ac.c ac needs-flag + +# Human (Hilarious) Interface Loop +# XXX should be a real device +file arch/hp300/dev/hil.c +file arch/hp300/dev/hil_keymaps.c + +# +# Non-device files +# + +file arch/hp300/hp300/autoconf.c +file arch/hp300/hp300/clock.c +file arch/hp300/hp300/conf.c +file arch/hp300/hp300/db_memrw.c ddb | kgdb +file arch/hp300/hp300/dkbad.c +file arch/hp300/hp300/kgdb_glue.c kgdb compile-with "${NORMAL_C} -fno-defer-pop" +file arch/hp300/hp300/kgdb_stub.c kgdb +file arch/hp300/hp300/machdep.c +file arch/hp300/hp300/isr.c +file arch/hp300/hp300/mem.c +file arch/hp300/hp300/pmap.c +file arch/hp300/hp300/pmap_bootstrap.c +file arch/hp300/hp300/sys_machdep.c +file arch/hp300/hp300/trap.c +file arch/hp300/hp300/vm_machdep.c +file arch/hp300/hp300/disksubr.c +file arch/hp300/dev/dma.c + +file arch/m68k/m68k/copy.s + +file dev/cons.c +file dev/cninit.c + +file kludge_for_in_proto.c hy needs-flag + +# +# HP-UX binary compatibility +# +include "compat/hpux/files.hpux" +file arch/hp300/hp300/hpux_machdep.c compat_hpux diff --git a/sys/arch/hp300/conf/files.hp300.oldconf b/sys/arch/hp300/conf/files.hp300.oldconf index e2d1f5f1a27..78e592c6f3e 100644 --- a/sys/arch/hp300/conf/files.hp300.oldconf +++ b/sys/arch/hp300/conf/files.hp300.oldconf @@ -1,12 +1,14 @@ -# $NetBSD: files.hp300.oldconf,v 1.26.4.1 1996/06/10 06:51:58 thorpej Exp $ +# $OpenBSD: files.hp300.oldconf,v 1.6 1997/01/12 15:12:15 downsj Exp $ +# $NetBSD: files.hp300.oldconf,v 1.30 1997/01/05 04:41:48 thorpej Exp $ # arch/hp300/hp300/autoconf.c standard arch/hp300/hp300/clock.c standard arch/hp300/hp300/conf.c standard +arch/hp300/hp300/db_memrw.c optional ddb arch/hp300/hp300/dkbad.c standard arch/hp300/hp300/kgdb_glue.c optional kgdb compile-with "${NORMAL_C} -fno-defer-pop" arch/hp300/hp300/kgdb_stub.c optional kgdb -arch/hp300/hp300/machdep.c standard config-dependent +arch/hp300/hp300/machdep.c standard arch/hp300/hp300/isr.c standard arch/hp300/hp300/mem.c standard arch/hp300/hp300/pmap.c standard @@ -15,6 +17,7 @@ arch/hp300/hp300/sys_machdep.c standard arch/hp300/hp300/trap.c standard arch/hp300/hp300/vm_machdep.c standard arch/hp300/hp300/disksubr.c standard +arch/hp300/dev/dio.c standard arch/hp300/dev/grf_conf.c optional grf arch/hp300/dev/grf_dv.c optional grf needs-count # XXX? d-d? arch/hp300/dev/grf_gb.c optional grf needs-count # XXX? d-d? @@ -46,7 +49,6 @@ arch/hp300/dev/hil_keymaps.c standard arch/hp300/dev/ite.c optional ite needs-count # XXX? d-d? arch/hp300/dev/ite_subr.c optional ite needs-count # XXX? d-d? arch/m68k/m68k/copy.s standard -arch/m68k/m68k/db_memrw.c optional ddb dev/cons.c standard dev/cninit.c standard thisisfor_in_proto.c optional hy diff --git a/sys/arch/hp300/conf/std.hp300 b/sys/arch/hp300/conf/std.hp300 new file mode 100644 index 00000000000..144419845ef --- /dev/null +++ b/sys/arch/hp300/conf/std.hp300 @@ -0,0 +1,17 @@ +# $OpenBSD: std.hp300,v 1.1 1997/01/12 15:12:16 downsj Exp $ +# $NetBSD: std.hp300,v 1.1 1996/12/17 08:40:58 thorpej Exp $ +# +# Options/devices that all hp300s should have +# + +machine hp300 m68k + +# XXX new config glue, for now +options NEWCONFIG + +options SWAPPAGER # swap pager (anonymous and swap space) +options VNODEPAGER # vnode pager (mapped files) +options DEVPAGER # device pager (mapped devices) + +options EXEC_AOUT # support for exec'ing a.out +options EXEC_SCRIPT # support for #! scripts |