From b08e78d8dc7017037f04dba3408ee807a7ce5287 Mon Sep 17 00:00:00 2001 From: Michael Shalayeff Date: Thu, 25 Feb 1999 16:36:09 +0000 Subject: rearrange devices, fix irqs, more comments --- sys/arch/hppa/conf/GECKO | 48 ++++++++++++++++++++++++++-------------------- sys/arch/hppa/conf/GENERIC | 23 ++++++++++++---------- 2 files changed, 40 insertions(+), 31 deletions(-) diff --git a/sys/arch/hppa/conf/GECKO b/sys/arch/hppa/conf/GECKO index ef6bca2ad77..5fb1a7fc9cb 100644 --- a/sys/arch/hppa/conf/GECKO +++ b/sys/arch/hppa/conf/GECKO @@ -1,4 +1,4 @@ -# $OpenBSD: GECKO,v 1.2 1998/12/29 22:53:49 mickey Exp $ +# $OpenBSD: GECKO,v 1.3 1999/02/25 16:35:17 mickey Exp $ # # HP 9000/712/{60,80,80i,100} boxens # @@ -8,13 +8,10 @@ machine hppa include "../../../conf/GENERIC" -# Need to set locally maxusers 16 -# Support for various CPU types option HP7100LC - -#option FPEMUL +#option FPEMUL # has FPU onboard #option NS # XNS #option NSIP # XNS tunneling over IP @@ -25,32 +22,41 @@ option HP7100LC #option CCITT,LLC,HDLC # X.25 #option COMPAT_HPUX # HP-UX binary compatibility +#option COMPAT_OSF1 # OSF1 binary compatibility +#option COMPAT_LINUX # Mach/Linux binary compatibility config bsd swap generic -mainbus0 at root # root "bus" +mainbus0 at root # root "bus" mem0 at mainbus0 -cpu0 at mainbus0 -pdc0 at mainbus0 - -sti* at mainbus0 # STI graphics -wscons* at sti? - -lasi* at mainbus0 # LASI host adapter (LSI ???) -gsc* at lasi? # internal i/o space +pdc0 at mainbus0 # PDC/IODC wrapper for boot console +cpu0 at mainbus0 #irq 31 # HP PA7100LC processor +lasi* at mainbus0 irq 28 # LASI host adapter (LSI ???) +sti0 at mainbus0 # STI graphics +#sti1 at mainbus0 # STI graphics (add-in card) +# internal I/O space +gsc* at lasi? com0 at gsc? irq 5 # serial ports -com1 at gsc? irq 6 # serial ports +#com1 at gsc? irq 6? # serial ports (add-in card) lpt* at gsc? irq 7 # LPT centronics iface -ie* at gsc? irq 8 # 82C596 ether -siop* at gsc? irq 9 # NCR 53C710 +ie0 at gsc? irq 8 # 82C596 ether +#ie1 at gsc? irq 10? # 82C596 ether (add-in card) +siop0 at gsc? irq 9 # NCR 53C710 scsibus* at siop? -#atwo* at gsc? irq 13 # Audio Type 2 (CS4216) -#pcppi* at gsc? irq 27 # PS/2 kbd and mouse -#pckbd* at pcppi? # PS/2 keyboard -#pms* at pcppi? # PS/2 mouse +#atwo* at gsc? irq 13 # Audio Type 2 (CS4215) +#audio* at atwo? +pckbc0 at gsc? irq 27 +pckbd0 at pckbc0 # PS/2 keyboard +pms0 at pckbc0 # PS/2 mouse fdc0 at gsc? irq ? # PC floppy controller (WD37C65C) + +# MI devices +wsdisplay* at sti? +wskbd* at pckbd? +#wsmouse* at pms? + option FD_DEBUG fd0 at fdc0 drive 0 # floppy drives diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC index ed92f5932f5..61ab622225e 100644 --- a/sys/arch/hppa/conf/GENERIC +++ b/sys/arch/hppa/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.1 1999/02/20 20:26:19 mickey Exp $ +# $OpenBSD: GENERIC,v 1.2 1999/02/25 16:36:08 mickey Exp $ # # Generic kernel config (all that is supportted) # @@ -9,13 +9,16 @@ include "/sys/conf/GENERIC" maxusers 8 # Support for various CPU types +option HP7000 # PCX-S option HP7100 -option HP7100LC +option HP7150 # PCX-T +option HP7100LC # PCX-L option HP7200 -#option HP7300 -#option HP8000 -#option HP8200 -#option HP8300 +option HP7250 # PCX-T* +#option HP7300LC # PCX-L2 +#option HP8000 # PCX-U (in 32bit mode) +#option HP8200 # PCX-U+ (in 32bit mode) +#option HP8500 # PCX-W (in 32bit mode) option FPEMUL option USELEDS # blink w/ 'em @@ -72,15 +75,15 @@ ie0 at gsc? irq 8 # 82C5[89]6 ether #siop0 at gsc? irq 9 # NCR 53C7xx #siop1 at gsc? irq 3 # NCR 53C7xx (Fast/Wide) #scsibus* at siop? -#aone* at gsc? irq 13 # Audio Type 1 (???) +#aone* at gsc? irq 13 # Audio Type 1 (PSB 2160-N) #audio* at aone? -#atwo* at gsc? irq 13 # Audio Type 2 (CS4216) +#atwo* at gsc? irq 13 # Audio Type 2 (CS4215) #audio* at atwo? pckbc* at gsc? irq 27 pckbd* at pckbc? # PS/2 keyboard #pms* at pckbc? # PS/2 mouse -fdc* at gsc? # PC floppy controller (WD37C65C) -option FD_DEBUG +#fdc* at gsc? # PC floppy controller (WD37C65C) +#option FD_DEBUG # EISA devices #vga* at eisa? slot ? -- cgit v1.2.3