Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-8]: src/sys/arch Pull up following revision(s) (requested by rin ...
details: https://anonhg.NetBSD.org/src/rev/479874c90f71
branches: netbsd-8
changeset: 851264:479874c90f71
user: snj <snj%NetBSD.org@localhost>
date: Sun Jan 07 09:22:38 2018 +0000
description:
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.
--
diffstat:
sys/arch/amd64/conf/INSTALL | 6 +++---
sys/arch/i386/conf/INSTALL | 11 ++++++++---
2 files changed, 11 insertions(+), 6 deletions(-)
diffs (53 lines):
diff -r d441e0698697 -r 479874c90f71 sys/arch/amd64/conf/INSTALL
--- a/sys/arch/amd64/conf/INSTALL Sun Jan 07 09:19:40 2018 +0000
+++ b/sys/arch/amd64/conf/INSTALL Sun Jan 07 09:22:38 2018 +0000
@@ -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 @@
# DRMKMS driver
no i915drmkms* at pci?
no radeon* at pci?
-#no nouveau* at pci?
+no nouveau* at pci?
diff -r d441e0698697 -r 479874c90f71 sys/arch/i386/conf/INSTALL
--- a/sys/arch/i386/conf/INSTALL Sun Jan 07 09:19:40 2018 +0000
+++ b/sys/arch/i386/conf/INSTALL Sun Jan 07 09:22:38 2018 +0000
@@ -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 @@
# 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 ?
Home |
Main Index |
Thread Index |
Old Index