diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2007-04-04 20:47:55 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2007-04-04 20:47:55 +0000 |
| commit | cc4a2ddbb93710452de99cce2c57003887902391 (patch) | |
| tree | 90515e6ac989d857cecf60e8f748638207fe9435 /sys/arch | |
| parent | 4cc7600449830051a437dd1adf605295cb2f35d8 (diff) | |
Enable pyro(4) and ebus(4) at mainbus(4). Reorder bus drivers such that
the order in GENERIC and RAMDISK is identical.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/sparc64/conf/GENERIC | 17 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/RAMDISK | 16 |
2 files changed, 16 insertions, 17 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index 5f5e90b60e7..7106fee24ee 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.171 2007/03/30 22:28:57 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.172 2007/04/04 20:47:54 kettenis Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -28,24 +28,21 @@ config bsd swap generic mainbus0 at root cpu0 at mainbus0 -upa0 at mainbus0 - -# e4500/e5500 +# Bus types found on SPARC systems. +sbus* at mainbus0 central0 at mainbus0 fhc0 at central0 fhc* at mainbus0 - -# Bus types found on SPARC systems. - -sbus* at mainbus0 +upa0 at mainbus0 psycho* at mainbus0 pci* at psycho? schizo* at mainbus0 pci* at schizo? -#pyro* at mainbus0 -#pci* at pyro? +pyro* at mainbus0 +pci* at pyro? pci* at ppb? ppb* at pci? +ebus* at mainbus0 ebus* at pci? # PCI Ethernet diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK index da204a1f9cb..c2804f62d37 100644 --- a/sys/arch/sparc64/conf/RAMDISK +++ b/sys/arch/sparc64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.60 2007/03/07 06:23:02 miod Exp $ +# $OpenBSD: RAMDISK,v 1.61 2007/04/04 20:47:54 kettenis Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -39,19 +39,21 @@ config bsd root on rd0a mainbus0 at root cpu0 at mainbus0 +# Bus types found on SPARC systems. +sbus* at mainbus0 +upa0 at mainbus0 central0 at mainbus0 fhc0 at central0 fhc* at mainbus0 - -# Bus types found on SPARC systems. +psycho* at mainbus0 +pci* at psycho? schizo* at mainbus0 pci* at schizo? -sbus* at mainbus0 # Ultra 1/E4500 -psycho* at mainbus0 -upa0 at mainbus0 -pci* at psycho? # Ultra 5 +pyro* at mainbus0 +pci* at pyro? pci* at ppb? ppb* at pci? +ebus* at mainbus0 ebus* at pci? # PCI Ethernet |