Module Name: src
Committed By: maya
Date: Tue Dec 11 16:52:49 UTC 2018
Modified Files:
src/sys/arch/amd64/conf: GENERIC INSTALL
src/sys/arch/i386/conf: GENERIC INSTALL
Log Message:
revert previous, nouveau apparently works for some people.
To generate a diff of this commit:
cvs rdiff -u -r1.510 -r1.511 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/amd64/conf/INSTALL
cvs rdiff -u -r1.1195 -r1.1196 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.334 -r1.335 src/sys/arch/i386/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.510 src/sys/arch/amd64/conf/GENERIC:1.511
--- src/sys/arch/amd64/conf/GENERIC:1.510 Tue Dec 11 11:00:18 2018
+++ src/sys/arch/amd64/conf/GENERIC Tue Dec 11 16:52:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.510 2018/12/11 11:00:18 maya Exp $
+# $NetBSD: GENERIC,v 1.511 2018/12/11 16:52:49 maya Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.510 $"
+#ident "GENERIC-$Revision: 1.511 $"
maxusers 64 # estimated number of users
@@ -434,8 +434,8 @@ intelfb* at intelfbbus?
radeon* at pci? dev ? function ?
radeondrmkmsfb* at radeonfbbus?
-#nouveau* at pci? dev ? function ?
-#nouveaufb* at nouveaufbbus?
+nouveau* at pci? dev ? function ?
+nouveaufb* at nouveaufbbus?
# DRMUMS drivers
#viadrmums* at drm?
Index: src/sys/arch/amd64/conf/INSTALL
diff -u src/sys/arch/amd64/conf/INSTALL:1.93 src/sys/arch/amd64/conf/INSTALL:1.94
--- src/sys/arch/amd64/conf/INSTALL:1.93 Tue Dec 11 14:04:15 2018
+++ src/sys/arch/amd64/conf/INSTALL Tue Dec 11 16:52:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.93 2018/12/11 14:04:15 maya Exp $
+# $NetBSD: INSTALL,v 1.94 2018/12/11 16:52:49 maya Exp $
#
# INSTALL - Installation kernel.
#
@@ -8,7 +8,7 @@
include "arch/amd64/conf/GENERIC"
options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=115200
-#ident "INSTALL-$Revision: 1.93 $"
+#ident "INSTALL-$Revision: 1.94 $"
no options MEMORY_DISK_DYNAMIC
options MEMORY_DISK_IS_ROOT # force root on memory disk
@@ -19,4 +19,4 @@ options MEMORY_DISK_RBFLAGS=RB_SINGLE #
# DRMKMS driver
no i915drmkms* at pci?
no radeon* at pci?
-#no nouveau* at pci?
+no nouveau* at pci?
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1195 src/sys/arch/i386/conf/GENERIC:1.1196
--- src/sys/arch/i386/conf/GENERIC:1.1195 Tue Dec 11 11:00:18 2018
+++ src/sys/arch/i386/conf/GENERIC Tue Dec 11 16:52:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1195 2018/12/11 11:00:18 maya Exp $
+# $NetBSD: GENERIC,v 1.1196 2018/12/11 16:52:49 maya Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1195 $"
+#ident "GENERIC-$Revision: 1.1196 $"
maxusers 64 # estimated number of users
@@ -559,8 +559,8 @@ intelfb* at intelfbbus?
radeon* at pci? dev ? function ?
radeondrmkmsfb* at radeonfbbus?
-#nouveau* at pci? dev ? function ?
-#nouveaufb* at nouveaufbbus?
+nouveau* at pci? dev ? function ?
+nouveaufb* at nouveaufbbus?
# DRMUMS drivers
#viadrmums* at drm?
Index: src/sys/arch/i386/conf/INSTALL
diff -u src/sys/arch/i386/conf/INSTALL:1.334 src/sys/arch/i386/conf/INSTALL:1.335
--- src/sys/arch/i386/conf/INSTALL:1.334 Tue Dec 11 14:04:15 2018
+++ src/sys/arch/i386/conf/INSTALL Tue Dec 11 16:52:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.334 2018/12/11 14:04:15 maya Exp $
+# $NetBSD: INSTALL,v 1.335 2018/12/11 16:52:49 maya Exp $
#
# INSTALL - Installation kernel.
#
@@ -7,7 +7,7 @@
include "arch/i386/conf/MONOLITHIC"
-#ident "INSTALL-$Revision: 1.334 $"
+#ident "INSTALL-$Revision: 1.335 $"
no options MEMORY_DISK_DYNAMIC
options MEMORY_DISK_IS_ROOT # force root on memory disk
@@ -18,7 +18,7 @@ options MEMORY_DISK_RBFLAGS=RB_SINGLE #
# DRMKMS driver
no i915drmkms* at pci?
no radeon* at pci?
-#no nouveau* at pci?
+no nouveau* at pci?
# pre-PCI graphics drivers, not enabled in GENERIC
vga0 at isa?
