Module Name: src
Committed By: snj
Date: Sun Jan 7 09:22:38 UTC 2018
Modified Files:
src/sys/arch/amd64/conf [netbsd-8]: INSTALL
src/sys/arch/i386/conf [netbsd-8]: INSTALL
Log Message:
Pull up following revision(s) (requested by rin in ticket #467):
sys/arch/amd64/conf/INSTALL: 1.92
sys/arch/i386/conf/INSTALL: 1.332-1.333
install/52845: Enable vga@isa and pcdisplay for INSTALL. Otherwise, install
media do not boot on pre-PCI machines.
--
Disable nouveau for INSTALL as in a similar manner to other DRMKMS drivers.
--
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.91.8.1 src/sys/arch/amd64/conf/INSTALL
cvs rdiff -u -r1.331 -r1.331.12.1 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/INSTALL
diff -u src/sys/arch/amd64/conf/INSTALL:1.91 src/sys/arch/amd64/conf/INSTALL:1.91.8.1
--- src/sys/arch/amd64/conf/INSTALL:1.91 Sun Dec 18 04:35:26 2016
+++ src/sys/arch/amd64/conf/INSTALL Sun Jan 7 09:22:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.91 2016/12/18 04:35:26 dholland Exp $
+# $NetBSD: INSTALL,v 1.91.8.1 2018/01/07 09:22:38 snj Exp $
#
# INSTALL - Installation kernel.
#
@@ -8,7 +8,7 @@
include "arch/amd64/conf/GENERIC"
options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=115200
-#ident "INSTALL-$Revision: 1.91 $"
+#ident "INSTALL-$Revision: 1.91.8.1 $"
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/INSTALL
diff -u src/sys/arch/i386/conf/INSTALL:1.331 src/sys/arch/i386/conf/INSTALL:1.331.12.1
--- src/sys/arch/i386/conf/INSTALL:1.331 Sun Nov 2 23:14:20 2014
+++ src/sys/arch/i386/conf/INSTALL Sun Jan 7 09:22:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.331 2014/11/02 23:14:20 christos Exp $
+# $NetBSD: INSTALL,v 1.331.12.1 2018/01/07 09:22:38 snj Exp $
#
# INSTALL - Installation kernel.
#
@@ -7,7 +7,7 @@
include "arch/i386/conf/MONOLITHIC"
-#ident "INSTALL-$Revision: 1.331 $"
+#ident "INSTALL-$Revision: 1.331.12.1 $"
no options MEMORY_DISK_DYNAMIC
options MEMORY_DISK_IS_ROOT # force root on memory disk
@@ -18,4 +18,9 @@ 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?
+pcdisplay0 at isa? # CGA, MDA, EGA, HGA
+wsdisplay* at pcdisplay? console ?
