diff options
Diffstat (limited to 'sys/arch/hppa/conf/GENERIC')
-rw-r--r-- | sys/arch/hppa/conf/GENERIC | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC index 975b951df6a..9794a7f93e2 100644 --- a/sys/arch/hppa/conf/GENERIC +++ b/sys/arch/hppa/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.28 2003/02/18 15:24:04 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.29 2003/02/28 13:57:39 mickey Exp $ # Machine architecture; required by config(8) machine hppa @@ -6,10 +6,10 @@ machine hppa include "../../../conf/GENERIC" # Support for various CPU types -option HP7000_CPU # PCX -option HP7100_CPU,HP7150_CPU # PCXS +option HP7000_CPU # PCXS +option HP7100_CPU,HP7150_CPU # PCXT option HP7100LC_CPU,HP7300LC_CPU # PCXL, PCXL2 -option HP7200_CPU,HP7250_CPU # PCXT, PCXT' +option HP7200_CPU,HP7250_CPU # PCXT' #option HP8000_CPU # PCXU #option HP8200_CPU # PCXU2 #option HP8500_CPU # PCXW @@ -29,14 +29,14 @@ pdc0 at mainbus0 # PDC/IODC wrapper for boot console cpu* at mainbus0 irq 31 # HP PA-RISC cpu phantomas0 at mainbus0 # Phantom PseudoBC GSC+ Port #fpu* at mainbus0 # HP PA-RISC fpu (iv N/A) -#pmu* at mainbus0 # HP PA-RISC perfomance monitor unit (iv 29) +#pmu* at mainbus0 irq 29 # HP PA-RISC perfomance monitor unit #power* at mainbus0 # power/fail manager (iv 2) -lasi0 at mainbus0 offset 0x100000 irq 28 # LASI host adapter (LSI PN???) -lasi0 at mainbus0 offset 0xfd00000 irq 28 # LASI on J210 +lasi0 at mainbus0 offset 0x100000 irq 28 # LASI host adapter +lasi0 at mainbus0 offset 0xfd00000 irq 28 # LASI on C1[01]0, J2[01]0 lasi0 at phantomas0 offset 0xfd00000 irq 28 # LASI on [ABC]* -lasi1 at mainbus0 offset 0x500000 irq 27 # GIO card -asp* at mainbus0 irq 28 # this one comes w/ Viper and leds +lasi1 at mainbus0 offset 0x500000 irq 27 # 712 GIO card +asp* at mainbus0 irq 28 # this one comes w/ Viper and LEDs #wax* at mainbus0 irq 24 # Wax may host EISA as well mongoose* at mainbus0 irq 17 # EISA Bus Adapter (i82350 or TI???) #vmeb* at mainbus0 irq ? # VME bus adapter @@ -46,8 +46,8 @@ sti0 at mainbus0 irq 11 # [H]CRX-{8,24,48}[Z] graphics sti1 at mainbus0 disable irq 12 # internal i/o space -gsc0 at asp? # 7xx -gsc0 at lasi0 # 712,715/100,725/75,725/100 +gsc0 at asp? # Snakes, old 715, old 725, 735/755 +gsc0 at lasi0 # 712,715/100,725/64,725/100,[ABCJ]* gsc1 at lasi1 #gsc2 at wax? # it's another face of LASI @@ -78,14 +78,14 @@ com1 at gsc0 offset 0x22000 irq 6 com2 at gsc0 offset 0x0 irq 13 # only on asp0 w/o audio (off ?) lpt0 at gsc? irq 7 # both com and lpt are on WD16C552 -ie0 at gsc0 irq 8 # 82C5[89]6 ether +ie0 at gsc0 irq 8 # 82C596DX/CA ether ie1 at gsc1 irq 8 -#tms* at gsc? irq 10 # TMS380C26 Network Controller (either 802.3 or 802.5) -osiop0 at gsc? irq 9 # NCR 53C700/710 -#osiop1 at gsc? irq 3 # NCR 53C720 (Fast/Wide) +#tms* at gsc? irq 10 # TMS380C26 Network Controller (802.3 or 802.5) +osiop0 at gsc? irq 9 # NCR 53C700/710 (Narrow SE) scsibus* at osiop? -#aone* at gsc? irq 13 # Audio Type 1 (PSB 2160-N) -#audio* at aone? +#scsibus* at siop? +#siop1 at gsc? irq 3 # NCR 53C720 (Fast/Wide Diff) +#scsibus* at siop? harmony* at gsc? irq 13 # Audio Type 2 (CS4215/AD1849) audio* at harmony? gsckbc* at gsc? irq 26 @@ -129,4 +129,4 @@ ch* at scsibus? target ? lun ? ss* at scsibus? target ? lun ? uk* at scsibus? target ? lun ? -pseudo-device wsmux 2 # mouse and keyboard multiplexor pseudo-device +pseudo-device wsmux 2 # mouse and keyboard multiplexor |