diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2008-03-30 12:30:03 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2008-03-30 12:30:03 +0000 |
| commit | 37acbf0e13a665ca92ffbbff85d6275d37214116 (patch) | |
| tree | c269779ff0b9032ea5f2187d22a40ce5cbc6fa4a /sys/arch/sparc64/conf | |
| parent | f26f63bce294bf1232407c4a823b5023208a308c (diff) | |
More sun4v support. GENERIC and RAMDISK kernels will now boot on both
sun4u and sun4v. GENERIC.MP won't work yet though.
Diffstat (limited to 'sys/arch/sparc64/conf')
| -rw-r--r-- | sys/arch/sparc64/conf/GENERIC | 11 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/RAMDISK | 11 |
2 files changed, 20 insertions, 2 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index 0a6c33779c1..2c58ae98628 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.197 2008/03/13 23:06:19 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.198 2008/03/30 12:30:02 kettenis Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -13,6 +13,8 @@ machine sparc64 include "../../../conf/GENERIC" maxusers 64 # estimated number of users +option SUN4V + option PCIVERBOSE option USER_PCICONF # user-space PCI configuration option APERTURE @@ -40,10 +42,13 @@ schizo* at mainbus0 pci* at schizo? pyro* at mainbus0 pci* at pyro? +vpci* at mainbus0 +pci* at vpci? pci* at ppb? ppb* at pci? ebus* at mainbus0 ebus* at pci? +vbus0 at mainbus0 # PCI Ethernet lmc* at pci? # Lan Media Corp SSI/T3/HSSI @@ -290,6 +295,10 @@ prtc0 at mainbus0 ## Timer chip found on (some) sun4u systems. timer* at mainbus0 +# Virtual devices for sun4v systems. +vcons0 at vbus? +vrtc0 at vbus? + ## Lance Ethernet - AMD7990 le* at sbus? ledma* at sbus? diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK index c93413e95d6..4aeb1155772 100644 --- a/sys/arch/sparc64/conf/RAMDISK +++ b/sys/arch/sparc64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.68 2008/03/13 23:06:19 kettenis Exp $ +# $OpenBSD: RAMDISK,v 1.69 2008/03/30 12:30:02 kettenis Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -9,6 +9,8 @@ maxusers 2 option RAMDISK_HOOKS option MINIROOTSIZE=6144 +option SUN4V + option PCIVERBOSE #option USBVERBOSE @@ -50,10 +52,13 @@ schizo* at mainbus0 pci* at schizo? pyro* at mainbus0 pci* at pyro? +vpci* at mainbus0 +pci* at vpci? pci* at ppb? ppb* at pci? ebus* at mainbus0 ebus* at pci? +vbus0 at mainbus0 # PCI Ethernet hme* at pci? # Sun Happy Meal 10/100 @@ -87,6 +92,10 @@ clock0 at fhc? rtc* at ebus? # DS1287/M5819 clock timer* at mainbus0 # Timer chip +# Virtual devices for sun4v systems. +vcons0 at vbus? +vrtc0 at vbus? + ## Lance Ethernet - AMD7990 le* at sbus? ledma* at sbus? |