Module Name: src
Committed By: thorpej
Date: Mon May 14 21:05:17 UTC 2018
Modified Files:
src/sys/arch/acorn32/conf: EB7500ATX GENERIC INSTALL LOWMEM_WSCONS NC
Log Message:
Fully specifiy the location of indirectly-configured I2C devices. In
particular, the parent spec must not be wild-carded, as doing so doesn't
work well on systems where more than one I2C bus is present.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/acorn32/conf/EB7500ATX
cvs rdiff -u -r1.124 -r1.125 src/sys/arch/acorn32/conf/GENERIC
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/acorn32/conf/INSTALL
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/acorn32/conf/LOWMEM_WSCONS
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/acorn32/conf/NC
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/acorn32/conf/EB7500ATX
diff -u src/sys/arch/acorn32/conf/EB7500ATX:1.64 src/sys/arch/acorn32/conf/EB7500ATX:1.65
--- src/sys/arch/acorn32/conf/EB7500ATX:1.64 Tue Jan 23 14:47:53 2018
+++ src/sys/arch/acorn32/conf/EB7500ATX Mon May 14 21:05:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: EB7500ATX,v 1.64 2018/01/23 14:47:53 sevan Exp $
+# $NetBSD: EB7500ATX,v 1.65 2018/05/14 21:05:17 thorpej Exp $
#
# EB7500ATX --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "EB7500ATX-$Revision: 1.64 $"
+#ident "EB7500ATX-$Revision: 1.65 $"
# estimated number of users
maxusers 32
@@ -159,10 +159,10 @@ clock* at iomd?
# IIC bus device
#iomdiic* at iomd?
-#iic* at iomdiic?
+#iic0 at iomdiic?
# RTC device via IIC bus
-#pcfrtc* at iic? addr 0x50
+#pcfrtc* at iic0 addr 0x50
# VIDC device
vidc0 at mainbus?
Index: src/sys/arch/acorn32/conf/GENERIC
diff -u src/sys/arch/acorn32/conf/GENERIC:1.124 src/sys/arch/acorn32/conf/GENERIC:1.125
--- src/sys/arch/acorn32/conf/GENERIC:1.124 Tue Jan 23 14:47:53 2018
+++ src/sys/arch/acorn32/conf/GENERIC Mon May 14 21:05:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.124 2018/01/23 14:47:53 sevan Exp $
+# $NetBSD: GENERIC,v 1.125 2018/05/14 21:05:17 thorpej Exp $
#
# GENERIC --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.124 $"
+#ident "GENERIC-$Revision: 1.125 $"
# estimated number of users
maxusers 32
@@ -166,7 +166,7 @@ iomdiic* at iomd?
iic0 at iomdiic?
# RTC device via IIC bus
-pcfrtc* at iic? addr 0x50
+pcfrtc* at iic0 addr 0x50
# VIDC device
vidc0 at mainbus?
Index: src/sys/arch/acorn32/conf/INSTALL
diff -u src/sys/arch/acorn32/conf/INSTALL:1.78 src/sys/arch/acorn32/conf/INSTALL:1.79
--- src/sys/arch/acorn32/conf/INSTALL:1.78 Thu Sep 14 07:58:38 2017
+++ src/sys/arch/acorn32/conf/INSTALL Mon May 14 21:05:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.78 2017/09/14 07:58:38 mrg Exp $
+# $NetBSD: INSTALL,v 1.79 2018/05/14 21:05:17 thorpej Exp $
#
# INSTALL -- NetBSD/acorn32 install configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.78 $"
+#ident "INSTALL-$Revision: 1.79 $"
# estimated number of users
maxusers 32
@@ -148,7 +148,7 @@ iomdiic* at iomd?
iic0 at iomdiic?
# RTC device via IIC bus
-pcfrtc* at iic? addr 0x50
+pcfrtc* at iic0 addr 0x50
# VIDC device
vidc0 at mainbus?
Index: src/sys/arch/acorn32/conf/LOWMEM_WSCONS
diff -u src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.72 src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.73
--- src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.72 Thu Sep 14 07:58:38 2017
+++ src/sys/arch/acorn32/conf/LOWMEM_WSCONS Mon May 14 21:05:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: LOWMEM_WSCONS,v 1.72 2017/09/14 07:58:38 mrg Exp $
+# $NetBSD: LOWMEM_WSCONS,v 1.73 2018/05/14 21:05:17 thorpej Exp $
#
# LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines
#
@@ -126,7 +126,7 @@ iomdiic* at iomd?
iic0 at iomdiic?
# RTC device via IIC bus
-pcfrtc* at iic? addr 0x50
+pcfrtc* at iic0 addr 0x50
# VIDC device
vidc0 at mainbus?
Index: src/sys/arch/acorn32/conf/NC
diff -u src/sys/arch/acorn32/conf/NC:1.71 src/sys/arch/acorn32/conf/NC:1.72
--- src/sys/arch/acorn32/conf/NC:1.71 Thu Sep 14 07:58:38 2017
+++ src/sys/arch/acorn32/conf/NC Mon May 14 21:05:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: NC,v 1.71 2017/09/14 07:58:38 mrg Exp $
+# $NetBSD: NC,v 1.72 2018/05/14 21:05:17 thorpej Exp $
#
# NC - with wscons
#
@@ -122,7 +122,7 @@ iomdiic* at iomd?
iic0 at iomdiic?
# RTC device via IIC bus
-pcfrtc* at iic? addr 0x50
+pcfrtc* at iic0 addr 0x50
# VIDC device
vidc0 at mainbus?
