diff options
Diffstat (limited to 'sys/arch/loongson/conf')
| -rw-r--r-- | sys/arch/loongson/conf/GENERIC | 11 | ||||
| -rw-r--r-- | sys/arch/loongson/conf/RAMDISK | 8 | ||||
| -rw-r--r-- | sys/arch/loongson/conf/files.loongson | 11 |
3 files changed, 26 insertions, 4 deletions
diff --git a/sys/arch/loongson/conf/GENERIC b/sys/arch/loongson/conf/GENERIC index 9054d9bf57f..4c829bcd639 100644 --- a/sys/arch/loongson/conf/GENERIC +++ b/sys/arch/loongson/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.21 2010/03/03 20:57:28 mk Exp $ +# $OpenBSD: GENERIC,v 1.22 2010/05/08 21:59:53 miod Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -71,6 +71,15 @@ ohci* at voyager? smfb* at voyager? wsdisplay* at smfb? +# Generic 2E systems (in addition to the Fuloong devices) +pcib* at pci? +isa0 at pcib? +vga* at pci? +wsdisplay* at vga? +auvia* at pci? +audio* at auvia? +viaenv* at pci? + # USB Controllers ohci* at pci? uhci* at pci? diff --git a/sys/arch/loongson/conf/RAMDISK b/sys/arch/loongson/conf/RAMDISK index eea22315c1c..dafdb4dcb40 100644 --- a/sys/arch/loongson/conf/RAMDISK +++ b/sys/arch/loongson/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.11 2010/03/02 20:54:51 miod Exp $ +# $OpenBSD: RAMDISK,v 1.12 2010/05/08 21:59:53 miod Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -75,6 +75,12 @@ ohci* at voyager? smfb* at voyager? wsdisplay* at smfb? +# Generic 2E systems (in addition to the Fuloong devices) +pcib* at pci? +isa0 at pcib? +vga* at pci? +wsdisplay* at vga? + # USB Controllers ohci* at pci? uhci* at pci? diff --git a/sys/arch/loongson/conf/files.loongson b/sys/arch/loongson/conf/files.loongson index 0efef75c2bb..1fb209cdc08 100644 --- a/sys/arch/loongson/conf/files.loongson +++ b/sys/arch/loongson/conf/files.loongson @@ -1,4 +1,4 @@ -# $OpenBSD: files.loongson,v 1.10 2010/03/03 13:33:27 jasper Exp $ +# $OpenBSD: files.loongson,v 1.11 2010/05/08 21:59:53 miod Exp $ # Standard stanzas config(8) can't run without maxpartitions 16 @@ -18,6 +18,8 @@ file arch/loongson/loongson/bus_space.c file arch/loongson/loongson/conf.c file arch/loongson/loongson/disksubr.c disk file arch/loongson/loongson/gdium_machdep.c +file arch/loongson/loongson/generic2e_machdep.c +file arch/loongson/loongson/isa_machdep.c isa file arch/loongson/loongson/loongson2_machdep.c file arch/loongson/loongson/machdep.c file arch/loongson/loongson/mutex.c @@ -36,6 +38,7 @@ include "dev/isa/files.isa" include "dev/isa/files.isapnp" include "dev/mii/files.mii" include "dev/pci/files.pci" +include "dev/pci/files.agp" include "dev/pckbc/files.pckbc" include "dev/usb/files.usb" include "dev/bluetooth/files.bluetooth" @@ -66,7 +69,11 @@ file arch/loongson/dev/glx.c bonito & pci device glxpcib: isabus, gpiobus attach glxpcib at pci file arch/loongson/dev/glxpcib.c glxpcib -file arch/loongson/dev/pcib.c glxpcib + +# Other PCI-ISA bridges +device pcib: isabus +attach pcib at pci +file arch/loongson/dev/pcib.c pcib | glxpcib # Lemote Yeeloong RTC device mcclock |