diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2008-04-20 17:17:33 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2008-04-20 17:17:33 +0000 |
| commit | ab341360f106923585fecf54fc81ea0ce3986718 (patch) | |
| tree | 11ce7af2fd6e5b823844f68095167c8f9339d100 /sys/arch/hppa64/conf | |
| parent | 31ef9cb64a206d478084facfc925f796060495c9 (diff) | |
Bring over astro(4) from hppa, to replace pluto(4).
Diffstat (limited to 'sys/arch/hppa64/conf')
| -rw-r--r-- | sys/arch/hppa64/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/hppa64/conf/files.hppa64 | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/hppa64/conf/GENERIC b/sys/arch/hppa64/conf/GENERIC index be57a4e7682..b4d0e96acd0 100644 --- a/sys/arch/hppa64/conf/GENERIC +++ b/sys/arch/hppa64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.14 2008/04/20 16:56:20 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.15 2008/04/20 17:17:32 kettenis Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -30,9 +30,9 @@ mem* at mainbus0 flags 0x00 # /dev/*mem and memory controller pdc0 at mainbus0 # PDC/IODC wrapper for boot console #power0 at mainbus0 # power/fail manager (iv 30) cpu* at mainbus0 # HP PA-RISC cpu -plut0 at mainbus0 # Astro Runway-Ropes, MIOC and IOA +astro* at mainbus0 # Astro Runway-Ropes, MIOC and IOA -elroy* at plut0 +elroy* at astro? pci* at elroy? option PCIVERBOSE diff --git a/sys/arch/hppa64/conf/files.hppa64 b/sys/arch/hppa64/conf/files.hppa64 index c3f8db40430..eaa17856c54 100644 --- a/sys/arch/hppa64/conf/files.hppa64 +++ b/sys/arch/hppa64/conf/files.hppa64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.hppa64,v 1.7 2008/04/20 16:58:44 kettenis Exp $ +# $OpenBSD: files.hppa64,v 1.8 2008/04/20 17:17:32 kettenis Exp $ # # hppa64-specific configuration info @@ -86,9 +86,9 @@ attach cpu at gedoens file arch/hppa64/dev/cpu.c cpu # Astro/Pluto, integrated Runway-Ropes bridge, MIOC and IOA -device plut: gedoens -attach plut at gedoens -file arch/hppa64/dev/pluto.c plut +device astro: gedoens +attach astro at gedoens +file arch/hppa64/dev/astro.c astro # Elroy, Ropes to PCI Bridge. Supports 4X PCI and dual address cycle. # Mercury; QuickSilver is an AGP also |