Module Name: src
Committed By: sevan
Date: Mon Feb 26 23:09:32 UTC 2018
Modified Files:
src/sys/arch/macppc/conf: GENERIC GENERIC_601 MAMBO files.macppc
src/sys/dev: DEVNAMES
Removed Files:
src/sys/arch/macppc/dev: ofcons.c
Log Message:
Remove support for macofcons(4), it's not actually possible to build a kernel
with it enabled - See PR port-macppc/53004 and it may have further problems even
so.
>From <macallan>:
"There is some early console code that uses OF output but it causes problems
when we get close to MMU setup - I think it can go, it hasn't been enabled in
any config in at least a decade as far as I know."
To generate a diff of this commit:
cvs rdiff -u -r1.343 -r1.344 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/macppc/conf/GENERIC_601
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/macppc/conf/MAMBO
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/macppc/conf/files.macppc
cvs rdiff -u -r1.29 -r0 src/sys/arch/macppc/dev/ofcons.c
cvs rdiff -u -r1.300 -r1.301 src/sys/dev/DEVNAMES
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/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.343 src/sys/arch/macppc/conf/GENERIC:1.344
--- src/sys/arch/macppc/conf/GENERIC:1.343 Sat Feb 24 18:58:00 2018
+++ src/sys/arch/macppc/conf/GENERIC Mon Feb 26 23:09:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.343 2018/02/24 18:58:00 sevan Exp $
+# $NetBSD: GENERIC,v 1.344 2018/02/26 23:09:32 sevan Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.343 $"
+#ident "GENERIC-$Revision: 1.344 $"
maxusers 32
@@ -292,8 +292,6 @@ genfb* at pci? function ?
wsdisplay0 at wsemuldisplaydev? console 1
wsdisplay* at wsemuldisplaydev?
-#macofcons0 at pci? dev ? function ? # OpenFirmware console (for debugging)
-
# Other PCI devices
pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver
acardide* at pci? dev ? function ? # Acard IDE controllers
Index: src/sys/arch/macppc/conf/GENERIC_601
diff -u src/sys/arch/macppc/conf/GENERIC_601:1.19 src/sys/arch/macppc/conf/GENERIC_601:1.20
--- src/sys/arch/macppc/conf/GENERIC_601:1.19 Sat Feb 24 18:58:00 2018
+++ src/sys/arch/macppc/conf/GENERIC_601 Mon Feb 26 23:09:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_601,v 1.19 2018/02/24 18:58:00 sevan Exp $
+# $NetBSD: GENERIC_601,v 1.20 2018/02/26 23:09:32 sevan Exp $
#
# GENERIC machine description file
#
@@ -28,7 +28,7 @@ include "arch/macppc/conf/std.macppc.60
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.19 $"
+ident "GENERIC-$Revision: 1.20 $"
maxusers 32
@@ -239,8 +239,6 @@ genfb* at pci? function ?
wsdisplay0 at wsemuldisplaydev? console 1
wsdisplay* at wsemuldisplaydev?
-#macofcons0 at pci? dev ? function ? # OpenFirmware console (for debugging)
-
obio* at pci? dev ? function ?
mc* at obio? # MACE ethernet
Index: src/sys/arch/macppc/conf/MAMBO
diff -u src/sys/arch/macppc/conf/MAMBO:1.30 src/sys/arch/macppc/conf/MAMBO:1.31
--- src/sys/arch/macppc/conf/MAMBO:1.30 Sat Feb 24 18:58:00 2018
+++ src/sys/arch/macppc/conf/MAMBO Mon Feb 26 23:09:32 2018
@@ -6,7 +6,7 @@ include "arch/macppc/conf/std.macppc.g5
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.30 $"
+#ident "GENERIC-$Revision: 1.31 $"
maxusers 32
@@ -133,8 +133,6 @@ ppb* at pci? dev ? function ? # PCI-PCI
#ofb* at pci? dev ? function ? # Generic Open Firmware Framebuffer
pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver
obio* at pci? dev ? function ?
-macofcons0 at pci? dev ? function ? # OpenFirmware console (for debugging)
-#macofcons0 at mainbus? # OpenFirmware console (for debugging)
# PCI serial interfaces
nvram* at obio? # nvram
Index: src/sys/arch/macppc/conf/files.macppc
diff -u src/sys/arch/macppc/conf/files.macppc:1.106 src/sys/arch/macppc/conf/files.macppc:1.107
--- src/sys/arch/macppc/conf/files.macppc:1.106 Mon Dec 18 15:53:38 2017
+++ src/sys/arch/macppc/conf/files.macppc Mon Feb 26 23:09:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.macppc,v 1.106 2017/12/18 15:53:38 skrll Exp $
+# $NetBSD: files.macppc,v 1.107 2018/02/26 23:09:32 sevan Exp $
#
# macppc-specific configuration info
@@ -265,10 +265,6 @@ attach macgpio at obio with gpio_obio
#attach gpio at macgpio with gpio_gpio
file arch/macppc/dev/gpio.c macgpio
-device macofcons: tty
-attach macofcons at pci
-file arch/macppc/dev/ofcons.c macofcons needs-flag
-
attach com at mainbus with com_mainbus
file arch/macppc/dev/com_mainbus.c com_mainbus
Index: src/sys/dev/DEVNAMES
diff -u src/sys/dev/DEVNAMES:1.300 src/sys/dev/DEVNAMES:1.301
--- src/sys/dev/DEVNAMES:1.300 Mon Dec 18 07:05:16 2017
+++ src/sys/dev/DEVNAMES Mon Feb 26 23:09:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: DEVNAMES,v 1.300 2017/12/18 07:05:16 msaitoh Exp $
+# $NetBSD: DEVNAMES,v 1.301 2018/02/26 23:09:32 sevan Exp $
#
# This file contains all used device names and defined attributes in
# alphabetical order. New devices added to the system somewhere should first
@@ -792,7 +792,6 @@ mace sgimips
macepci sgimips
macfb mac68k
machfb sparc64
-macofcons macppc
macvid mac68k
magma MI
mainbus acorn32
