Thu Jun 7 13:36:29 2018 UTC ()
Revert changes that pinned-down i2c parent specs.  The i2c subsystem
has been enhanced to make this unnecessary.


(thorpej)
diff -r1.65 -r1.66 src/sys/arch/acorn32/conf/EB7500ATX
diff -r1.125 -r1.126 src/sys/arch/acorn32/conf/GENERIC
diff -r1.79 -r1.80 src/sys/arch/acorn32/conf/INSTALL
diff -r1.73 -r1.74 src/sys/arch/acorn32/conf/LOWMEM_WSCONS
diff -r1.72 -r1.73 src/sys/arch/acorn32/conf/NC
diff -r1.382 -r1.383 src/sys/arch/alpha/conf/GENERIC
diff -r1.88 -r1.89 src/sys/arch/amd64/conf/ALL
diff -r1.492 -r1.493 src/sys/arch/amd64/conf/GENERIC
diff -r1.150 -r1.151 src/sys/arch/amd64/conf/XEN3_DOM0
diff -r1.22 -r1.23 src/sys/arch/evbarm/conf/ARMADAXP
diff -r1.39 -r1.40 src/sys/arch/evbarm/conf/ARMADILLO210
diff -r1.56 -r1.57 src/sys/arch/evbarm/conf/ARMADILLO9
diff -r1.56 -r1.57 src/sys/arch/evbarm/conf/MPCSA_GENERIC
diff -r1.6 -r1.7 src/sys/arch/evbarm/conf/CUBOX
diff -r1.10 -r1.11 src/sys/arch/evbarm/conf/DNS323
diff -r1.95 -r1.96 src/sys/arch/evbarm/conf/GUMSTIX
diff -r1.9 -r1.10 src/sys/arch/evbarm/conf/KUROBOX_PRO
diff -r1.2 -r1.3 src/sys/arch/evbarm/conf/KURONAS_X4
diff -r1.35 -r1.36 src/sys/arch/evbarm/conf/MMNET_GENERIC
diff -r1.36 -r1.37 src/sys/arch/evbarm/conf/MV2120
diff -r1.93 -r1.94 src/sys/arch/evbarm/conf/TEAMASA_NPWR
diff -r1.16 -r1.17 src/sys/arch/evbarm/conf/VTC100
diff -r1.30 -r1.31 src/sys/arch/evbmips/conf/GDIUM
diff -r1.37 -r1.38 src/sys/arch/evbmips/conf/LOONGSON
diff -r1.23 -r1.24 src/sys/arch/hpcarm/conf/NETBOOKPRO
diff -r1.439 -r1.440 src/sys/arch/i386/conf/ALL
diff -r1.1179 -r1.1180 src/sys/arch/i386/conf/GENERIC
diff -r1.128 -r1.129 src/sys/arch/i386/conf/XEN3_DOM0
diff -r1.24 -r1.25 src/sys/arch/mmeye/conf/MMEYE_WLF
diff -r1.76 -r1.77 src/sys/arch/zaurus/conf/GENERIC
diff -r1.36 -r1.37 src/sys/arch/zaurus/conf/INSTALL
diff -r1.3 -r1.4 src/sys/arch/zaurus/conf/INSTALL_C700
cvs diff -r1.65 -r1.66 src/sys/arch/acorn32/conf/EB7500ATX (expand / switch to unified diff)

--- src/sys/arch/acorn32/conf/EB7500ATX 2018/05/14 21:05:17 1.65
+++ src/sys/arch/acorn32/conf/EB7500ATX 2018/06/07 13:36:28 1.66
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: EB7500ATX,v 1.65 2018/05/14 21:05:17 thorpej Exp $ 1# $NetBSD: EB7500ATX,v 1.66 2018/06/07 13:36:28 thorpej Exp $
2# 2#
3# EB7500ATX --- NetBSD/acorn32 complete configuration 3# EB7500ATX --- NetBSD/acorn32 complete configuration
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. This generic kernel does not include all options, subsystems 6# kernel. This generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/acorn32/conf/std.acorn32" 21include "arch/acorn32/conf/std.acorn32"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "EB7500ATX-$Revision: 1.65 $" 25#ident "EB7500ATX-$Revision: 1.66 $"
26 26
27# estimated number of users 27# estimated number of users
28maxusers 32 28maxusers 32
29 29
30# Standard system options 30# Standard system options
31 31
32options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT 32options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
33#options NTP # NTP phase/frequency locked loop 33#options NTP # NTP phase/frequency locked loop
34 34
35# CPU options 35# CPU options
36options CPU_ARM7 # Support the ARM7 core 36options CPU_ARM7 # Support the ARM7 core
37 37
38options EB7500ATX # Define in case needed 38options EB7500ATX # Define in case needed
@@ -149,30 +149,30 @@ options NFS_BOOT_DHCP @@ -149,30 +149,30 @@ options NFS_BOOT_DHCP
149mainbus0 at root 149mainbus0 at root
150 150
151# The boot CPU 151# The boot CPU
152cpu0 at mainbus? 152cpu0 at mainbus?
153 153
154# The IOMD 154# The IOMD
155iomd0 at mainbus? 155iomd0 at mainbus?
156 156
157# system clock via IOMD 157# system clock via IOMD
158clock* at iomd? 158clock* at iomd?
159 159
160# IIC bus device 160# IIC bus device
161#iomdiic* at iomd? 161#iomdiic* at iomd?
162#iic0 at iomdiic? 162#iic* at iomdiic?
163 163
164# RTC device via IIC bus 164# RTC device via IIC bus
165#pcfrtc* at iic0 addr 0x50 165#pcfrtc* at iic? addr 0x50
166 166
167# VIDC device 167# VIDC device
168vidc0 at mainbus? 168vidc0 at mainbus?
169 169
170# WSCONS 170# WSCONS
171# ws console uses DUMB, SUN or VT100 terminal emulation 171# ws console uses DUMB, SUN or VT100 terminal emulation
172#options WSEMUL_NODUMB 172#options WSEMUL_NODUMB
173#options WSEMUL_SUN 173#options WSEMUL_SUN
174options WSEMUL_VT100 174options WSEMUL_VT100
175 175
176#options WSDISPLAY_COMPAT_RAWKBD 176#options WSDISPLAY_COMPAT_RAWKBD
177options WSDISPLAY_COMPAT_USL # wsconscfg VT handling 177options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
178 178
cvs diff -r1.125 -r1.126 src/sys/arch/acorn32/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/acorn32/conf/GENERIC 2018/05/14 21:05:17 1.125
+++ src/sys/arch/acorn32/conf/GENERIC 2018/06/07 13:36:28 1.126
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.125 2018/05/14 21:05:17 thorpej Exp $ 1# $NetBSD: GENERIC,v 1.126 2018/06/07 13:36:28 thorpej Exp $
2# 2#
3# GENERIC --- NetBSD/acorn32 complete configuration 3# GENERIC --- NetBSD/acorn32 complete configuration
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/acorn32/conf/std.acorn32" 21include "arch/acorn32/conf/std.acorn32"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.125 $" 25#ident "GENERIC-$Revision: 1.126 $"
26 26
27# estimated number of users 27# estimated number of users
28maxusers 32 28maxusers 32
29 29
30# Standard system options 30# Standard system options
31 31
32options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT 32options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
33#options NTP # NTP phase/frequency locked loop 33#options NTP # NTP phase/frequency locked loop
34 34
35# CPU options 35# CPU options
36options CPU_SA110 # Support the SA110 core 36options CPU_SA110 # Support the SA110 core
37options CPU_ARM6 # Support the ARM6 core 37options CPU_ARM6 # Support the ARM6 core
38options CPU_ARM7 # Support the ARM7 core 38options CPU_ARM7 # Support the ARM7 core
@@ -156,27 +156,27 @@ mainbus0 at root @@ -156,27 +156,27 @@ mainbus0 at root
156cpu0 at mainbus? 156cpu0 at mainbus?
157 157
158# The IOMD 158# The IOMD
159iomd0 at mainbus? 159iomd0 at mainbus?
160 160
161# system clock via IOMD 161# system clock via IOMD
162clock* at iomd? 162clock* at iomd?
163 163
164# IIC bus device 164# IIC bus device
165iomdiic* at iomd? 165iomdiic* at iomd?
166iic0 at iomdiic? 166iic0 at iomdiic?
167 167
168# RTC device via IIC bus 168# RTC device via IIC bus
169pcfrtc* at iic0 addr 0x50 169pcfrtc* at iic? addr 0x50
170 170
171# VIDC device 171# VIDC device
172vidc0 at mainbus? 172vidc0 at mainbus?
173 173
174# WSCONS 174# WSCONS
175# ws console uses DUMB, SUN or VT100 terminal emulation 175# ws console uses DUMB, SUN or VT100 terminal emulation
176#options WSEMUL_NODUMB 176#options WSEMUL_NODUMB
177#options WSEMUL_SUN 177#options WSEMUL_SUN
178options WSEMUL_VT100 178options WSEMUL_VT100
179 179
180options WS_KERNEL_FG=WSCOL_GREEN 180options WS_KERNEL_FG=WSCOL_GREEN
181 181
182#options WSDISPLAY_COMPAT_RAWKBD 182#options WSDISPLAY_COMPAT_RAWKBD
cvs diff -r1.79 -r1.80 src/sys/arch/acorn32/conf/INSTALL (expand / switch to unified diff)

--- src/sys/arch/acorn32/conf/INSTALL 2018/05/14 21:05:17 1.79
+++ src/sys/arch/acorn32/conf/INSTALL 2018/06/07 13:36:28 1.80
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: INSTALL,v 1.79 2018/05/14 21:05:17 thorpej Exp $ 1# $NetBSD: INSTALL,v 1.80 2018/06/07 13:36:28 thorpej Exp $
2# 2#
3# INSTALL -- NetBSD/acorn32 install configuration 3# INSTALL -- NetBSD/acorn32 install configuration
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/acorn32/conf/std.acorn32" 21include "arch/acorn32/conf/std.acorn32"
22 22
23#options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "INSTALL-$Revision: 1.79 $" 25#ident "INSTALL-$Revision: 1.80 $"
26 26
27# estimated number of users 27# estimated number of users
28maxusers 32 28maxusers 32
29 29
30# Standard system options 30# Standard system options
31 31
32options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT 32options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
33#options NTP # NTP phase/frequency locked loop 33#options NTP # NTP phase/frequency locked loop
34 34
35# CPU options 35# CPU options
36options CPU_SA110 # Support the SA110 core 36options CPU_SA110 # Support the SA110 core
37options CPU_ARM6 # Support the ARM6 core 37options CPU_ARM6 # Support the ARM6 core
38options CPU_ARM7 # Support the ARM7 core 38options CPU_ARM7 # Support the ARM7 core
@@ -138,27 +138,27 @@ mainbus0 at root @@ -138,27 +138,27 @@ mainbus0 at root
138cpu0 at mainbus? 138cpu0 at mainbus?
139 139
140# The IOMD 140# The IOMD
141iomd0 at mainbus? 141iomd0 at mainbus?
142 142
143# system clock via IOMD 143# system clock via IOMD
144clock* at iomd? 144clock* at iomd?
145 145
146# IIC bus device 146# IIC bus device
147iomdiic* at iomd? 147iomdiic* at iomd?
148iic0 at iomdiic? 148iic0 at iomdiic?
149 149
150# RTC device via IIC bus 150# RTC device via IIC bus
151pcfrtc* at iic0 addr 0x50 151pcfrtc* at iic? addr 0x50
152 152
153# VIDC device 153# VIDC device
154vidc0 at mainbus? 154vidc0 at mainbus?
155 155
156# WSCONS 156# WSCONS
157# ws console uses DUMB, SUN or VT100 terminal emulation 157# ws console uses DUMB, SUN or VT100 terminal emulation
158#options WSEMUL_NODUMB 158#options WSEMUL_NODUMB
159#options WSEMUL_SUN 159#options WSEMUL_SUN
160options WSEMUL_VT100 160options WSEMUL_VT100
161 161
162#options WSDISPLAY_COMPAT_RAWKBD 162#options WSDISPLAY_COMPAT_RAWKBD
163#options WSDISPLAY_COMPAT_USL # wsconscfg VT handling 163#options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
164 164
cvs diff -r1.73 -r1.74 src/sys/arch/acorn32/conf/LOWMEM_WSCONS (expand / switch to unified diff)

--- src/sys/arch/acorn32/conf/LOWMEM_WSCONS 2018/05/14 21:05:17 1.73
+++ src/sys/arch/acorn32/conf/LOWMEM_WSCONS 2018/06/07 13:36:28 1.74
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: LOWMEM_WSCONS,v 1.73 2018/05/14 21:05:17 thorpej Exp $ 1# $NetBSD: LOWMEM_WSCONS,v 1.74 2018/06/07 13:36:28 thorpej Exp $
2# 2#
3# LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines 3# LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines
4# 4#
5 5
6include "arch/acorn32/conf/std.acorn32" 6include "arch/acorn32/conf/std.acorn32"
7 7
8#options INCLUDE_CONFIG_FILE # embed config file in kernel binary 8#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
9 9
10# estimated number of users 10# estimated number of users
11 11
12maxusers 2 12maxusers 2
13 13
14# Standard system options 14# Standard system options
@@ -116,27 +116,27 @@ mainbus0 at root @@ -116,27 +116,27 @@ mainbus0 at root
116cpu0 at mainbus? 116cpu0 at mainbus?
117 117
118# The IOMD 118# The IOMD
119iomd0 at mainbus? 119iomd0 at mainbus?
120 120
121# system clock via IOMD 121# system clock via IOMD
122clock* at iomd? 122clock* at iomd?
123 123
124# IIC bus device 124# IIC bus device
125iomdiic* at iomd? 125iomdiic* at iomd?
126iic0 at iomdiic? 126iic0 at iomdiic?
127 127
128# RTC device via IIC bus 128# RTC device via IIC bus
129pcfrtc* at iic0 addr 0x50 129pcfrtc* at iic? addr 0x50
130 130
131# VIDC device 131# VIDC device
132vidc0 at mainbus? 132vidc0 at mainbus?
133 133
134# WSCONS 134# WSCONS
135# ws console uses DUMB, SUN or VT100 terminal emulation 135# ws console uses DUMB, SUN or VT100 terminal emulation
136#options WSEMUL_NODUMB 136#options WSEMUL_NODUMB
137#options WSEMUL_SUN 137#options WSEMUL_SUN
138options WSEMUL_VT100 138options WSEMUL_VT100
139 139
140#options WSDISPLAY_COMPAT_RAWKBD 140#options WSDISPLAY_COMPAT_RAWKBD
141#options WSDISPLAY_COMPAT_USL # wsconscfg VT handling 141#options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
142 142
cvs diff -r1.72 -r1.73 src/sys/arch/acorn32/conf/NC (expand / switch to unified diff)

--- src/sys/arch/acorn32/conf/NC 2018/05/14 21:05:17 1.72
+++ src/sys/arch/acorn32/conf/NC 2018/06/07 13:36:28 1.73
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: NC,v 1.72 2018/05/14 21:05:17 thorpej Exp $ 1# $NetBSD: NC,v 1.73 2018/06/07 13:36:28 thorpej Exp $
2# 2#
3# NC - with wscons 3# NC - with wscons
4# 4#
5 5
6include "arch/acorn32/conf/std.acorn32" 6include "arch/acorn32/conf/std.acorn32"
7 7
8#options INCLUDE_CONFIG_FILE # embed config file in kernel binary 8#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
9 9
10# estimated number of users 10# estimated number of users
11 11
12maxusers 16 12maxusers 16
13 13
14# Standard system options 14# Standard system options
@@ -112,27 +112,27 @@ mainbus0 at root @@ -112,27 +112,27 @@ mainbus0 at root
112cpu0 at mainbus? 112cpu0 at mainbus?
113 113
114# The IOMD 114# The IOMD
115iomd0 at mainbus? 115iomd0 at mainbus?
116 116
117# system clock via IOMD 117# system clock via IOMD
118clock* at iomd? 118clock* at iomd?
119 119
120# IIC bus device 120# IIC bus device
121iomdiic* at iomd? 121iomdiic* at iomd?
122iic0 at iomdiic? 122iic0 at iomdiic?
123 123
124# RTC device via IIC bus 124# RTC device via IIC bus
125pcfrtc* at iic0 addr 0x50 125pcfrtc* at iic? addr 0x50
126 126
127# VIDC device 127# VIDC device
128vidc0 at mainbus? 128vidc0 at mainbus?
129 129
130# WSCONS 130# WSCONS
131# ws console uses DUMB, SUN or VT100 terminal emulation 131# ws console uses DUMB, SUN or VT100 terminal emulation
132#options WSEMUL_NODUMB 132#options WSEMUL_NODUMB
133#options WSEMUL_SUN 133#options WSEMUL_SUN
134options WSEMUL_VT100 134options WSEMUL_VT100
135 135
136#options WSDISPLAY_COMPAT_USL # wsconscfg VT handling 136#options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
137 137
138#options FONT_BOLD8x16 138#options FONT_BOLD8x16
cvs diff -r1.382 -r1.383 src/sys/arch/alpha/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/alpha/conf/GENERIC 2018/05/15 00:42:35 1.382
+++ src/sys/arch/alpha/conf/GENERIC 2018/06/07 13:36:28 1.383
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1# $NetBSD: GENERIC,v 1.382 2018/05/15 00:42:35 thorpej Exp $ 1# $NetBSD: GENERIC,v 1.383 2018/06/07 13:36:28 thorpej Exp $
2# 2#
3# This machine description file is used to generate the default NetBSD 3# This machine description file is used to generate the default NetBSD
4# kernel. 4# kernel.
5# 5#
6# The machine description file can be customised for your specific 6# The machine description file can be customised for your specific
7# machine to reduce the kernel size and improve its performance. 7# machine to reduce the kernel size and improve its performance.
8# 8#
9# For further information on compiling NetBSD kernels, see the config(8) 9# For further information on compiling NetBSD kernels, see the config(8)
10# man page. 10# man page.
11# 11#
12# For further information on hardware support for this architecture, see 12# For further information on hardware support for this architecture, see
13# the intro(4) man page. For further information about kernel options 13# the intro(4) man page. For further information about kernel options
14# for this architecture, see the options(4) man page. For an explanation 14# for this architecture, see the options(4) man page. For an explanation
15# of each device driver in this file see the section 4 man page for the 15# of each device driver in this file see the section 4 man page for the
16# device. 16# device.
17 17
18include "arch/alpha/conf/std.alpha" 18include "arch/alpha/conf/std.alpha"
19 19
20options INCLUDE_CONFIG_FILE # embed config file in kernel binary 20options INCLUDE_CONFIG_FILE # embed config file in kernel binary
21 21
22ident "GENERIC-$Revision: 1.382 $" 22ident "GENERIC-$Revision: 1.383 $"
23 23
24maxusers 32 24maxusers 32
25 25
26# CPU Support 26# CPU Support
27options DEC_2000_300 # "Jensen": 2000/300 (DECpc AXP 150) 27options DEC_2000_300 # "Jensen": 2000/300 (DECpc AXP 150)
28options DEC_2100_A50 # Avanti etc: AlphaStation 400, 200, etc. 28options DEC_2100_A50 # Avanti etc: AlphaStation 400, 200, etc.
29options DEC_2100_A500 # Sable: AlphaServer 2100 29options DEC_2100_A500 # Sable: AlphaServer 2100
30options DEC_2100A_A500 # Lynx: AlphaServer 2100A 30options DEC_2100A_A500 # Lynx: AlphaServer 2100A
31options DEC_3000_500 # Flamingo etc: 3000/[4-9]00* 31options DEC_3000_500 # Flamingo etc: 3000/[4-9]00*
32options DEC_3000_300 # Pelican etc: 3000/300* 32options DEC_3000_300 # Pelican etc: 3000/300*
33options DEC_AXPPCI_33 # NoName: AXPpci33, Multia, etc. 33options DEC_AXPPCI_33 # NoName: AXPpci33, Multia, etc.
34options DEC_EB164 # EB164: AlphaPC 164 34options DEC_EB164 # EB164: AlphaPC 164
35options DEC_EB64PLUS # EB64+: AlphaPC 64, etc. 35options DEC_EB64PLUS # EB64+: AlphaPC 64, etc.
@@ -529,38 +529,38 @@ cd* at atapibus? drive ? # ATAPI CD-ROM @@ -529,38 +529,38 @@ cd* at atapibus? drive ? # ATAPI CD-ROM
529 529
530# Floppy drives 530# Floppy drives
531fd* at fdc? drive ? 531fd* at fdc? drive ?
532 532
533# Hardware RAID devices 533# Hardware RAID devices
534ld* at cac? unit ? 534ld* at cac? unit ?
535ld* at mlx? unit ? 535ld* at mlx? unit ?
536 536
537# Acer Labs M7101 SMBus controller 537# Acer Labs M7101 SMBus controller
538alipm* at pci? dev ? function ? 538alipm* at pci? dev ? function ?
539iic* at alipm? 539iic* at alipm?
540 540
541# AlphaServer DS20L i2c devices 541# AlphaServer DS20L i2c devices
542#lmenv* at iic0 addr 0x2c 542#lmenv* at iic? addr 0x2c
543#lmenv* at iic0 addr 0x2d 543#lmenv* at iic? addr 0x2d
544#lmenv* at iic0 addr 0x2e 544#lmenv* at iic? addr 0x2e
545#lmenv* at iic0 addr 0x2f 545#lmenv* at iic? addr 0x2f
546#spdmem* at iic0 addr 0x50 546#spdmem* at iic? addr 0x50
547#spdmem* at iic0 addr 0x51 547#spdmem* at iic? addr 0x51
548#spdmem* at iic0 addr 0x52 548#spdmem* at iic? addr 0x52
549#spdmem* at iic0 addr 0x53 549#spdmem* at iic? addr 0x53
550#spdmem* at iic0 addr 0x54 550#spdmem* at iic? addr 0x54
551#spdmem* at iic0 addr 0x55 551#spdmem* at iic? addr 0x55
552#spdmem* at iic0 addr 0x56 552#spdmem* at iic? addr 0x56
553#spdmem* at iic0 addr 0x57 553#spdmem* at iic? addr 0x57
554#seeprom* at iic0 addr 0x51 flags 0x2 554#seeprom* at iic0 addr 0x51 flags 0x2
555 555
556# PCMCIA USB controllers 556# PCMCIA USB controllers
557slhci* at pcmcia? function ? # ScanLogic SL811HS 557slhci* at pcmcia? function ? # ScanLogic SL811HS
558 558
559# USB bus support 559# USB bus support
560usb* at ehci? 560usb* at ehci?
561usb* at ohci? 561usb* at ohci?
562usb* at slhci? 562usb* at slhci?
563usb* at uhci? 563usb* at uhci?
564 564
565# USB Hubs 565# USB Hubs
566uhub* at usb? 566uhub* at usb?
cvs diff -r1.88 -r1.89 src/sys/arch/amd64/conf/ALL (expand / switch to unified diff)

--- src/sys/arch/amd64/conf/ALL 2018/05/19 09:27:09 1.88
+++ src/sys/arch/amd64/conf/ALL 2018/06/07 13:36:28 1.89
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: ALL,v 1.88 2018/05/19 09:27:09 jdolecek Exp $ 1# $NetBSD: ALL,v 1.89 2018/06/07 13:36:28 thorpej Exp $
2# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp 2# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
3# 3#
4# ALL machine description file 4# ALL machine description file
5# 5#
6# This machine description includes all devices and options and it is 6# This machine description includes all devices and options and it is
7# used to compile-test the source and does not necessarily produce a 7# used to compile-test the source and does not necessarily produce a
8# bootable or useful kernel. 8# bootable or useful kernel.
9# 9#
10# For further information on hardware support for this architecture, see 10# For further information on hardware support for this architecture, see
11# the intro(4) man page. For further information about kernel options 11# the intro(4) man page. For further information about kernel options
12# for this architecture, see the options(4) man page. For an explanation 12# for this architecture, see the options(4) man page. For an explanation
13# of each device driver in this file see the section 4 man page for the 13# of each device driver in this file see the section 4 man page for the
14# device. 14# device.
15 15
16include "arch/amd64/conf/std.amd64" 16include "arch/amd64/conf/std.amd64"
17 17
18options INCLUDE_CONFIG_FILE # embed config file in kernel binary 18options INCLUDE_CONFIG_FILE # embed config file in kernel binary
19 19
20#ident "ALL-$Revision: 1.88 $" 20#ident "ALL-$Revision: 1.89 $"
21 21
22maxusers 64 # estimated number of users 22maxusers 64 # estimated number of users
23 23
24makeoptions USE_SSP=yes 24makeoptions USE_SSP=yes
25 25
26# CPU-related options. 26# CPU-related options.
27#options USER_LDT # user-settable LDT; used by WINE 27#options USER_LDT # user-settable LDT; used by WINE
28options X86EMU # 386 Real Mode emulator 28options X86EMU # 386 Real Mode emulator
29#options PAE # PAE mode (36 bits physical addressing) 29#options PAE # PAE mode (36 bits physical addressing)
30makeoptions SPECTRE_V2_GCC_MITIGATION=1 # GCC Spectre variant 2 30makeoptions SPECTRE_V2_GCC_MITIGATION=1 # GCC Spectre variant 2
31 # migitation 31 # migitation
32 32
33# CPU features 33# CPU features
@@ -584,44 +584,44 @@ lpt2 at isa? port 0x3bc @@ -584,44 +584,44 @@ lpt2 at isa? port 0x3bc
584 584
585# Temperatures 585# Temperatures
586amdsmn* at pci? # AMD SMN Configuration 586amdsmn* at pci? # AMD SMN Configuration
587amdzentemp* at amdsmnbus? # AMD Ryzen Family 17h CPU temp sensors 587amdzentemp* at amdsmnbus? # AMD Ryzen Family 17h CPU temp sensors
588 588
589amdnb_misc* at pci? # AMD NB Misc Configuration 589amdnb_misc* at pci? # AMD NB Misc Configuration
590amdtemp* at amdnb_misc? # AMD CPU Temperature sensors 590amdtemp* at amdnb_misc? # AMD CPU Temperature sensors
591 591
592# Winbond LPC Super I/O 592# Winbond LPC Super I/O
593wbsio* at isa? port 0x2e 593wbsio* at isa? port 0x2e
594wbsio* at isa? port 0x4e 594wbsio* at isa? port 0x4e
595 595
596# IBM Hawk Integrated Systems Management Processor 596# IBM Hawk Integrated Systems Management Processor
597ibmhawk0 at iic0 addr 0x37 597ibmhawk0 at iic? addr 0x37
598 598
599# Intel Integrated Memory Controller SMBus (experimental) 599# Intel Integrated Memory Controller SMBus (experimental)
600imc* at pci? dev ? function ? # Intel Integrated Memory Controller, 600imc* at pci? dev ? function ? # Intel Integrated Memory Controller,
601imcsmb* at imc? # the associated SMBus controller, 601imcsmb* at imc? # the associated SMBus controller,
602iic* at imcsmb? # and the SMBus itself 602iic* at imcsmb? # and the SMBus itself
603 603
604# LM7[89] and compatible hardware monitors 604# LM7[89] and compatible hardware monitors
605# Use flags to select temp sensor type (see lm(4) man page for details) 605# Use flags to select temp sensor type (see lm(4) man page for details)
606lm0 at isa? port 0x290 flags 0x0 # other common ports: 0x280, 0x310 606lm0 at isa? port 0x290 flags 0x0 # other common ports: 0x280, 0x310
607lm* at wbsio? 607lm* at wbsio?
608 608
609# SMSC LPC47B397 hardware monitor functions 609# SMSC LPC47B397 hardware monitor functions
610smsc0 at isa? port 0x02e 610smsc0 at isa? port 0x02e
611 611
612# SMSC LPC47M192 hardware monitor 612# SMSC LPC47M192 hardware monitor
613smscmon* at iic0 addr 0x2c 613smscmon* at iic? addr 0x2c
614smscmon* at iic0 addr 0x2d # (alternate address) 614smscmon* at iic? addr 0x2d # (alternate address)
615 615
616# AMD 768 and 8111 power/ACPI controllers 616# AMD 768 and 8111 power/ACPI controllers
617amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface 617amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface
618iic* at amdpm? # sensors below are on this bus 618iic* at amdpm? # sensors below are on this bus
619 619
620# Acer Labs M7101 SMBus controller 620# Acer Labs M7101 SMBus controller
621alipm* at pci? dev ? function ? 621alipm* at pci? dev ? function ?
622iic* at alipm? 622iic* at alipm?
623 623
624# Intel ICH SMBus controller 624# Intel ICH SMBus controller
625ichsmb* at pci? dev ? function ? 625ichsmb* at pci? dev ? function ?
626iic* at ichsmb? 626iic* at ichsmb?
627 627
@@ -629,40 +629,40 @@ iic* at ichsmb? @@ -629,40 +629,40 @@ iic* at ichsmb?
629nfsmbc* at pci? dev ? function ? 629nfsmbc* at pci? dev ? function ?
630nfsmb* at nfsmbc? 630nfsmb* at nfsmbc?
631iic* at nfsmb? 631iic* at nfsmb?
632 632
633# Intel PIIX4 power management controllers 633# Intel PIIX4 power management controllers
634piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller 634piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller
635iic* at piixpm? # SMBus on PIIX4 635iic* at piixpm? # SMBus on PIIX4
636 636
637# I2C controller as found in some Intel PCH devices. 637# I2C controller as found in some Intel PCH devices.
638dwiic* at pci? # I2C controller 638dwiic* at pci? # I2C controller
639iic* at dwiic? 639iic* at dwiic?
640 640
641# dbCool Thermal monitor and fan controller 641# dbCool Thermal monitor and fan controller
642dbcool* at iic0 addr 0x2C # Unknown other motherboard(s) 642dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
643dbcool* at iic0 addr 0x2D # Tyan S2881 643dbcool* at iic? addr 0x2D # Tyan S2881
644dbcool* at iic0 addr 0x2E # Tyan S2882-D 644dbcool* at iic? addr 0x2E # Tyan S2882-D
645 645
646# IBM Hawk Integrated Systems Management Processor 646# IBM Hawk Integrated Systems Management Processor
647ibmhawk0 at iic0 addr 0x37 647ibmhawk0 at iic? addr 0x37
648 648
649# LM7[89] and compatible hardware monitors 649# LM7[89] and compatible hardware monitors
650# Use flags to select temp sensor type (see lm(4) man page for details) 650# Use flags to select temp sensor type (see lm(4) man page for details)
651lm0 at iic0 addr 0x2e flags 0x0 651lm0 at iic? addr 0x2e flags 0x0
652 652
653# SMSC LPC47M192 hardware monitor 653# SMSC LPC47M192 hardware monitor
654smscmon* at iic0 addr 0x2c 654smscmon* at iic? addr 0x2c
655#smscmon* at iic0 addr 0x2d # (alternate address) 655#smscmon* at iic? addr 0x2d # (alternate address)
656 656
657# IBM Thinkpad Active Protection System 657# IBM Thinkpad Active Protection System
658aps0 at isa? port 0x1600 658aps0 at isa? port 0x1600
659 659
660# Fintek Super I/O with hardware monitor 660# Fintek Super I/O with hardware monitor
661finsio0 at isa? port 0x4e 661finsio0 at isa? port 0x4e
662 662
663# iTE IT87xxF Super I/O with watchdog and sensors support 663# iTE IT87xxF Super I/O with watchdog and sensors support
664itesio0 at isa? port 0x2e 664itesio0 at isa? port 0x2e
665 665
666# Winbond LPC Super I/O 666# Winbond LPC Super I/O
667wbsio* at isa? port 0x2e 667wbsio* at isa? port 0x2e
668wbsio* at isa? port 0x4e 668wbsio* at isa? port 0x4e
@@ -675,42 +675,42 @@ lm* at wbsio? @@ -675,42 +675,42 @@ lm* at wbsio?
675smsc0 at isa? port 0x02e 675smsc0 at isa? port 0x02e
676 676
677# PC87366 hardware monitor 677# PC87366 hardware monitor
678nsclpcsio* at isa? 678nsclpcsio* at isa?
679gpio* at nsclpcsio? 679gpio* at nsclpcsio?
680 680
681# Abit uGuru Hardware system monitor 681# Abit uGuru Hardware system monitor
682ug0 at isa? port 0xe0 682ug0 at isa? port 0xe0
683 683
684# VIA VT82C686A/VT8231 Hardware Monitor and Power Management Timer 684# VIA VT82C686A/VT8231 Hardware Monitor and Power Management Timer
685viaenv* at pci? dev ? function ? 685viaenv* at pci? dev ? function ?
686 686
687# Serial Presence Detect capable memory modules and optional temp sensors 687# Serial Presence Detect capable memory modules and optional temp sensors
688spdmem* at iic0 addr 0x50 688spdmem* at iic? addr 0x50
689spdmem* at iic0 addr 0x51 689spdmem* at iic? addr 0x51
690spdmem* at iic0 addr 0x52 690spdmem* at iic? addr 0x52
691spdmem* at iic0 addr 0x53 691spdmem* at iic? addr 0x53
692spdmem* at iic0 addr 0x54 692spdmem* at iic? addr 0x54
693spdmem* at iic0 addr 0x55 693spdmem* at iic? addr 0x55
694spdmem* at iic0 addr 0x56 694spdmem* at iic? addr 0x56
695spdmem* at iic0 addr 0x57 695spdmem* at iic? addr 0x57
696sdtemp* at iic0 addr 0x18 696sdtemp* at iic? addr 0x18
697sdtemp* at iic0 addr 0x19 697sdtemp* at iic? addr 0x19
698sdtemp* at iic0 addr 0x1a 698sdtemp* at iic? addr 0x1a
699sdtemp* at iic0 addr 0x1b 699sdtemp* at iic? addr 0x1b
700sdtemp* at iic0 addr 0x1c 700sdtemp* at iic? addr 0x1c
701sdtemp* at iic0 addr 0x1d 701sdtemp* at iic? addr 0x1d
702sdtemp* at iic0 addr 0x1e 702sdtemp* at iic? addr 0x1e
703sdtemp* at iic0 addr 0x1f 703sdtemp* at iic? addr 0x1f
704 704
705# I2C HID devices 705# I2C HID devices
706ihidev* at iic? 706ihidev* at iic?
707 707
708# I2C Mice 708# I2C Mice
709ims* at ihidev? reportid ? 709ims* at ihidev? reportid ?
710wsmouse* at ims? mux 0 710wsmouse* at ims? mux 0
711 711
712# I2O devices 712# I2O devices
713iop* at pci? dev ? function ? # I/O processor 713iop* at pci? dev ? function ? # I/O processor
714iopsp* at iop? tid ? # SCSI/FC-AL ports 714iopsp* at iop? tid ? # SCSI/FC-AL ports
715ld* at iop? tid ? # block devices 715ld* at iop? tid ? # block devices
716dpti* at iop? tid 0 # DPT/Adaptec control interface 716dpti* at iop? tid 0 # DPT/Adaptec control interface
cvs diff -r1.492 -r1.493 src/sys/arch/amd64/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/amd64/conf/GENERIC 2018/05/22 08:15:26 1.492
+++ src/sys/arch/amd64/conf/GENERIC 2018/06/07 13:36:28 1.493
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.492 2018/05/22 08:15:26 maxv Exp $ 1# $NetBSD: GENERIC,v 1.493 2018/06/07 13:36:28 thorpej Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/amd64/conf/std.amd64" 21include "arch/amd64/conf/std.amd64"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.492 $" 25#ident "GENERIC-$Revision: 1.493 $"
26 26
27maxusers 64 # estimated number of users 27maxusers 64 # estimated number of users
28 28
29# delay between "rebooting ..." message and hardware reset, in milliseconds 29# delay between "rebooting ..." message and hardware reset, in milliseconds
30#options CPURESET_DELAY=2000 30#options CPURESET_DELAY=2000
31 31
32# This option allows you to force a serial console at the specified 32# This option allows you to force a serial console at the specified
33# I/O address. see console(4) for details. 33# I/O address. see console(4) for details.
34#options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600 34#options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600
35# you don't want the option below ON iff you are using the 35# you don't want the option below ON iff you are using the
36# serial console option of the new boot strap code. 36# serial console option of the new boot strap code.
37#options CONS_OVERRIDE # Always use above! independent of boot info 37#options CONS_OVERRIDE # Always use above! independent of boot info
38 38
@@ -476,39 +476,39 @@ lpt1 at isa? port 0x278 @@ -476,39 +476,39 @@ lpt1 at isa? port 0x278
476# Hardware monitors 476# Hardware monitors
477 477
478amdnb_misc* at pci? # AMD NB Misc Configuration 478amdnb_misc* at pci? # AMD NB Misc Configuration
479amdtemp* at amdnb_misc? # AMD CPU Temperature sensors 479amdtemp* at amdnb_misc? # AMD CPU Temperature sensors
480 480
481amdsmn* at pci? # AMD SMN Configuration 481amdsmn* at pci? # AMD SMN Configuration
482amdzentemp* at amdsmnbus? # AMD Ryzen Family 17h CPU temp sensors 482amdzentemp* at amdsmnbus? # AMD Ryzen Family 17h CPU temp sensors
483 483
484# Winbond LPC Super I/O 484# Winbond LPC Super I/O
485#wbsio* at isa? port 0x2e 485#wbsio* at isa? port 0x2e
486#wbsio* at isa? port 0x4e 486#wbsio* at isa? port 0x4e
487 487
488# IBM Hawk Integrated Systems Management Processor 488# IBM Hawk Integrated Systems Management Processor
489#ibmhawk0 at iic0 addr 0x37 489#ibmhawk0 at iic? addr 0x37
490 490
491# LM7[89] and compatible hardware monitors 491# LM7[89] and compatible hardware monitors
492# Use flags to select temp sensor type (see lm(4) man page for details) 492# Use flags to select temp sensor type (see lm(4) man page for details)
493#lm0 at isa? port 0x290 flags 0x0 # other common ports: 0x280, 0x310 493#lm0 at isa? port 0x290 flags 0x0 # other common ports: 0x280, 0x310
494#lm* at wbsio? 494#lm* at wbsio?
495 495
496# SMSC LPC47B397 hardware monitor functions 496# SMSC LPC47B397 hardware monitor functions
497#smsc0 at isa? port 0x02e 497#smsc0 at isa? port 0x02e
498 498
499# SMSC LPC47M192 hardware monitor 499# SMSC LPC47M192 hardware monitor
500#smscmon* at iic0 addr 0x2c 500#smscmon* at iic? addr 0x2c
501#smscmon* at iic0 addr 0x2d # (alternate address) 501#smscmon* at iic? addr 0x2d # (alternate address)
502 502
503# AMD 768 and 8111 power/ACPI controllers 503# AMD 768 and 8111 power/ACPI controllers
504amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface 504amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface
505#iic* at amdpm? # sensors below are on this bus 505#iic* at amdpm? # sensors below are on this bus
506 506
507# NVIDIA nForce2/3/4 SMBus controller 507# NVIDIA nForce2/3/4 SMBus controller
508nfsmbc* at pci? dev ? function ? 508nfsmbc* at pci? dev ? function ?
509nfsmb* at nfsmbc? 509nfsmb* at nfsmbc?
510iic* at nfsmb? 510iic* at nfsmb?
511 511
512# Intel PIIX4 power management controllers 512# Intel PIIX4 power management controllers
513piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller 513piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller
514iic* at piixpm? # SMBus on PIIX4 514iic* at piixpm? # SMBus on PIIX4
@@ -516,59 +516,59 @@ iic* at piixpm? # SMBus on PIIX4 @@ -516,59 +516,59 @@ iic* at piixpm? # SMBus on PIIX4
516# Intel ICH SMBus controller 516# Intel ICH SMBus controller
517ichsmb* at pci? dev ? function ? 517ichsmb* at pci? dev ? function ?
518iic* at ichsmb? 518iic* at ichsmb?
519 519
520# Intel S1200,C2000 (non-pch) SMBus controller 520# Intel S1200,C2000 (non-pch) SMBus controller
521ismt* at pci? dev ? function ? 521ismt* at pci? dev ? function ?
522iic* at ismt? 522iic* at ismt?
523 523
524# I2C controller as found in some Intel PCH devices. 524# I2C controller as found in some Intel PCH devices.
525dwiic* at pci? # I2C controller 525dwiic* at pci? # I2C controller
526iic* at dwiic? 526iic* at dwiic?
527 527
528# Thermal monitor and fan controller 528# Thermal monitor and fan controller
529#dbcool* at iic0 addr 0x2C # Unknown other motherboard(s) 529#dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
530#dbcool* at iic0 addr 0x2D # Tyan S2881 530#dbcool* at iic? addr 0x2D # Tyan S2881
531#dbcool* at iic0 addr 0x2E # Tyan S2882-D 531#dbcool* at iic? addr 0x2E # Tyan S2882-D
532 532
533# IBM Thinkpad Active Protection System 533# IBM Thinkpad Active Protection System
534#aps0 at isa? port 0x1600 534#aps0 at isa? port 0x1600
535 535
536# Fintek Super I/O with hardware monitor 536# Fintek Super I/O with hardware monitor
537#finsio0 at isa? port 0x4e 537#finsio0 at isa? port 0x4e
538 538
539# iTE IT87xxF Super I/O with watchdog and sensors support 539# iTE IT87xxF Super I/O with watchdog and sensors support
540#itesio0 at isa? port 0x2e 540#itesio0 at isa? port 0x2e
541 541
542# Abit uGuru Hardware system monitor 542# Abit uGuru Hardware system monitor
543#ug0 at isa? port 0xe0 543#ug0 at isa? port 0xe0
544 544
545# Serial Presence Detect capable memory modules 545# Serial Presence Detect capable memory modules
546#spdmem* at iic0 addr 0x50 546#spdmem* at iic? addr 0x50
547#spdmem* at iic0 addr 0x51 547#spdmem* at iic? addr 0x51
548#spdmem* at iic0 addr 0x52 548#spdmem* at iic? addr 0x52
549#spdmem* at iic0 addr 0x53 549#spdmem* at iic? addr 0x53
550#spdmem* at iic0 addr 0x54 550#spdmem* at iic? addr 0x54
551#spdmem* at iic0 addr 0x55 551#spdmem* at iic? addr 0x55
552#spdmem* at iic0 addr 0x56 552#spdmem* at iic? addr 0x56
553#spdmem* at iic0 addr 0x57 553#spdmem* at iic? addr 0x57
554#sdtemp* at iic0 addr 0x18 554#sdtemp* at iic? addr 0x18
555#sdtemp* at iic0 addr 0x19 555#sdtemp* at iic? addr 0x19
556#sdtemp* at iic0 addr 0x1a 556#sdtemp* at iic? addr 0x1a
557#sdtemp* at iic0 addr 0x1b 557#sdtemp* at iic? addr 0x1b
558#sdtemp* at iic0 addr 0x1c 558#sdtemp* at iic? addr 0x1c
559#sdtemp* at iic0 addr 0x1d 559#sdtemp* at iic? addr 0x1d
560#sdtemp* at iic0 addr 0x1e 560#sdtemp* at iic? addr 0x1e
561#sdtemp* at iic0 addr 0x1f 561#sdtemp* at iic? addr 0x1f
562 562
563# I2C HID devices 563# I2C HID devices
564ihidev* at iic? 564ihidev* at iic?
565 565
566# I2C Mice 566# I2C Mice
567ims* at ihidev? reportid ? 567ims* at ihidev? reportid ?
568wsmouse* at ims? mux 0 568wsmouse* at ims? mux 0
569 569
570# I2O devices 570# I2O devices
571iop* at pci? dev ? function ? # I/O processor 571iop* at pci? dev ? function ? # I/O processor
572iopsp* at iop? tid ? # SCSI/FC-AL ports 572iopsp* at iop? tid ? # SCSI/FC-AL ports
573ld* at iop? tid ? # block devices 573ld* at iop? tid ? # block devices
574# XXX dpti.c wants a processor type that is not assigned for x86-64 574# XXX dpti.c wants a processor type that is not assigned for x86-64
cvs diff -r1.150 -r1.151 src/sys/arch/amd64/conf/XEN3_DOM0 (expand / switch to unified diff)

--- src/sys/arch/amd64/conf/XEN3_DOM0 2018/05/15 01:53:27 1.150
+++ src/sys/arch/amd64/conf/XEN3_DOM0 2018/06/07 13:36:28 1.151
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: XEN3_DOM0,v 1.150 2018/05/15 01:53:27 thorpej Exp $ 1# $NetBSD: XEN3_DOM0,v 1.151 2018/06/07 13:36:28 thorpej Exp $
2 2
3include "arch/amd64/conf/std.xen" 3include "arch/amd64/conf/std.xen"
4 4
5#options MULTIPROCESSOR # (not yet - dom0 stuff is not MP-safe) 5#options MULTIPROCESSOR # (not yet - dom0 stuff is not MP-safe)
6 6
7options INCLUDE_CONFIG_FILE # embed config file in kernel binary 7options INCLUDE_CONFIG_FILE # embed config file in kernel binary
8 8
9#options UVMHIST 9#options UVMHIST
10#options UVMHIST_PRINT 10#options UVMHIST_PRINT
11#options SYSCALL_DEBUG 11#options SYSCALL_DEBUG
12 12
13#ident "XEN3_DOM0-$Revision: 1.150 $" 13#ident "XEN3_DOM0-$Revision: 1.151 $"
14 14
15maxusers 32 # estimated number of users 15maxusers 32 # estimated number of users
16 16
17# 17#
18options DOM0OPS 18options DOM0OPS
19 19
20# boot messages with MPBIOS, acpi and ioapic can be quite large 20# boot messages with MPBIOS, acpi and ioapic can be quite large
21options MSGBUFSIZE=24576 21options MSGBUFSIZE=24576
22 22
23#options USER_LDT # user-settable LDT; used by WINE 23#options USER_LDT # user-settable LDT; used by WINE
24 24
25# CPU features 25# CPU features
26est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI) 26est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI)
@@ -304,47 +304,47 @@ amdzentemp* at amdsmnbus? # AMD Ryzen F @@ -304,47 +304,47 @@ amdzentemp* at amdsmnbus? # AMD Ryzen F
304# AMD 768 and 8111 power/ACPI controllers 304# AMD 768 and 8111 power/ACPI controllers
305amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface 305amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface
306#iic* at amdpm? # sensors below are on this bus 306#iic* at amdpm? # sensors below are on this bus
307 307
308# Intel ICH SMBus controller 308# Intel ICH SMBus controller
309ichsmb* at pci? dev ? function ? 309ichsmb* at pci? dev ? function ?
310iic* at ichsmb? 310iic* at ichsmb?
311 311
312# I2C controller as found in some Intel PCH devices. 312# I2C controller as found in some Intel PCH devices.
313dwiic* at pci? # I2C controller 313dwiic* at pci? # I2C controller
314iic* at dwiic? 314iic* at dwiic?
315 315
316# Thermal monitor and fan controller 316# Thermal monitor and fan controller
317#dbcool* at iic0 addr 0x2C # Unknown other motherboard(s) 317#dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
318#dbcool* at iic0 addr 0x2D # Tyan S2881 318#dbcool* at iic? addr 0x2D # Tyan S2881
319#dbcool* at iic0 addr 0x2E # Tyan S2882-D 319#dbcool* at iic? addr 0x2E # Tyan S2882-D
320 320
321# Serial Presence Detect capable memory modules 321# Serial Presence Detect capable memory modules
322#spdmem* at iic0 addr 0x50 322#spdmem* at iic? addr 0x50
323#spdmem* at iic0 addr 0x51 323#spdmem* at iic? addr 0x51
324#spdmem* at iic0 addr 0x52 324#spdmem* at iic? addr 0x52
325#spdmem* at iic0 addr 0x53 325#spdmem* at iic? addr 0x53
326#spdmem* at iic0 addr 0x54 326#spdmem* at iic? addr 0x54
327#spdmem* at iic0 addr 0x55 327#spdmem* at iic? addr 0x55
328#spdmem* at iic0 addr 0x56 328#spdmem* at iic? addr 0x56
329#spdmem* at iic0 addr 0x57 329#spdmem* at iic? addr 0x57
330#sdtemp* at iic0 addr 0x18 330#sdtemp* at iic? addr 0x18
331#sdtemp* at iic0 addr 0x19 331#sdtemp* at iic? addr 0x19
332#sdtemp* at iic0 addr 0x1a 332#sdtemp* at iic? addr 0x1a
333#sdtemp* at iic0 addr 0x1b 333#sdtemp* at iic? addr 0x1b
334#sdtemp* at iic0 addr 0x1c 334#sdtemp* at iic? addr 0x1c
335#sdtemp* at iic0 addr 0x1d 335#sdtemp* at iic? addr 0x1d
336#sdtemp* at iic0 addr 0x1e 336#sdtemp* at iic? addr 0x1e
337#sdtemp* at iic0 addr 0x1f 337#sdtemp* at iic? addr 0x1f
338 338
339# Winbond LPC Super I/O 339# Winbond LPC Super I/O
340#wbsio* at isa? port 0x2e 340#wbsio* at isa? port 0x2e
341#wbsio* at isa? port 0x4e 341#wbsio* at isa? port 0x4e
342 342
343# LM7[89] and compatible hardware monitors 343# LM7[89] and compatible hardware monitors
344#lm0 at isa? port 0x290 # other common: 0x280, 0x310, 0xc00 344#lm0 at isa? port 0x290 # other common: 0x280, 0x310, 0xc00
345#lm* at wbsio? 345#lm* at wbsio?
346 346
347# VIA VT82C686A/VT8231 Hardware Monitor and Power Management TImer 347# VIA VT82C686A/VT8231 Hardware Monitor and Power Management TImer
348#viaenv* at pci? dev ? function ? 348#viaenv* at pci? dev ? function ?
349 349
350 350
cvs diff -r1.22 -r1.23 src/sys/arch/evbarm/conf/ARMADAXP (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/ARMADAXP 2018/05/15 01:24:23 1.22
+++ src/sys/arch/evbarm/conf/ARMADAXP 2018/06/07 13:36:28 1.23
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# 1#
2# $NetBSD: ARMADAXP,v 1.22 2018/05/15 01:24:23 thorpej Exp $ 2# $NetBSD: ARMADAXP,v 1.23 2018/06/07 13:36:28 thorpej Exp $
3# 3#
4# ARMADA XP DEV BOARD 4# ARMADA XP DEV BOARD
5# 5#
6 6
7include "arch/evbarm/conf/std.armadaxp" 7include "arch/evbarm/conf/std.armadaxp"
8 8
9# estimated number of users 9# estimated number of users
10 10
11maxusers 32 11maxusers 32
12 12
13# Standard system options 13# Standard system options
14 14
15options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT 15options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
@@ -175,27 +175,27 @@ options CONSFREQ=250000000 @@ -175,27 +175,27 @@ options CONSFREQ=250000000
175 175
176# On-chip Two-Wire Serial Interface (TWSI) 176# On-chip Two-Wire Serial Interface (TWSI)
177gttwsi* at mvsoc? offset ? irq ? 177gttwsi* at mvsoc? offset ? irq ?
178iic* at gttwsi? 178iic* at gttwsi?
179 179
180# Serial Peripheral Interface (SPI) 180# Serial Peripheral Interface (SPI)
181mvspi* at mvsoc? offset ? irq ? 181mvspi* at mvsoc? offset ? irq ?
182spi* at mvspi? 182spi* at mvspi?
183 183
184spiflash0 at spiflashbus? 184spiflash0 at spiflashbus?
185m25p0 at spi? slave 0 185m25p0 at spi? slave 0
186 186
187# TWSI SDRAM Serial Presence Detect 187# TWSI SDRAM Serial Presence Detect
188spdmem0 at iic0 addr 0x56 188spdmem0 at iic? addr 0x56
189 189
190# On-chip Cryptographic Engines and Security Accelerator (S/W chaining) 190# On-chip Cryptographic Engines and Security Accelerator (S/W chaining)
191mvcesa* at mvsoc? offset ? irq ? 191mvcesa* at mvsoc? offset ? irq ?
192 192
193# On-chip Cryptographic Engines and Security Accelerator (H/W chaining) 193# On-chip Cryptographic Engines and Security Accelerator (H/W chaining)
194#mvxpsec* at mvsoc? offset ? irq ? 194#mvxpsec* at mvsoc? offset ? irq ?
195#options MVXPSEC_DEBUG=MVXPSEC_DEBUG_ALL 195#options MVXPSEC_DEBUG=MVXPSEC_DEBUG_ALL
196 196
197# On-chip USB 2.0 Interface 197# On-chip USB 2.0 Interface
198ehci* at mvsoc? offset ? irq ? 198ehci* at mvsoc? offset ? irq ?
199 199
200# USB bus support 200# USB bus support
201usb* at ehci? 201usb* at ehci?
cvs diff -r1.39 -r1.40 src/sys/arch/evbarm/conf/ARMADILLO210 (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/ARMADILLO210 2018/05/15 01:24:23 1.39
+++ src/sys/arch/evbarm/conf/ARMADILLO210 2018/06/07 13:36:28 1.40
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: ARMADILLO210,v 1.39 2018/05/15 01:24:23 thorpej Exp $ 1# $NetBSD: ARMADILLO210,v 1.40 2018/06/07 13:36:28 thorpej Exp $
2# 2#
3# ARMADILLO210 -- Atmark Techno, Armadillo-210 3# ARMADILLO210 -- Atmark Techno, Armadillo-210
4# 4#
5 5
6include "arch/evbarm/conf/std.armadillo9" 6include "arch/evbarm/conf/std.armadillo9"
7 7
8#options INCLUDE_CONFIG_FILE # embed config file in kernel binary 8#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
9options MSGBUFSIZE=65536 9options MSGBUFSIZE=65536
10#options KSTACK_CHECK_MAGIC 10#options KSTACK_CHECK_MAGIC
11 11
12# estimated number of users 12# estimated number of users
13maxusers 8 13maxusers 8
14 14
@@ -146,27 +146,27 @@ gpio* at epgpio? @@ -146,27 +146,27 @@ gpio* at epgpio?
146# On-chip serial UARTS 146# On-chip serial UARTS
147epcom0 at epsoc? addr 0x808c0000 size 0x1000 intr 52 147epcom0 at epsoc? addr 0x808c0000 size 0x1000 intr 52
148epcom1 at epsoc? addr 0x808d0000 size 0x1000 intr 54 148epcom1 at epsoc? addr 0x808d0000 size 0x1000 intr 54
149# RealTime Clock (no battery backup) 149# RealTime Clock (no battery backup)
150eprtc0 at epsoc? addr 0x80920000 size 0x10c intr 37 150eprtc0 at epsoc? addr 0x80920000 size 0x10c intr 37
151# Watchdog Timer 151# Watchdog Timer
152epwdog0 at epsoc? addr 0x80940000 size 0x08 intr 36 152epwdog0 at epsoc? addr 0x80940000 size 0x08 intr 36
153# LED 153# LED
154epled0 at epgpio0 port 4 bit1 1 bit2 0 154epled0 at epgpio0 port 4 bit1 1 bit2 0
155 155
156# I^2C Controller Unit 156# I^2C Controller Unit
157armadillo9iic0 at epgpio0 port 1 bit1 4 bit2 5 157armadillo9iic0 at epgpio0 port 1 bit1 4 bit2 5
158iic* at armadillo9iic? 158iic* at armadillo9iic?
159seeprom0 at iic0 addr 0x50 size 128 159seeprom0 at iic? addr 0x50 size 128
160 160
161# MII/PHY support 161# MII/PHY support
162lxtphy* at mii? phy ? # Level One LXT-970 PHYs 162lxtphy* at mii? phy ? # Level One LXT-970 PHYs
163 163
164 164
165# Pseudo-Devices 165# Pseudo-Devices
166 166
167# disk/mass storage pseudo-devices 167# disk/mass storage pseudo-devices
168pseudo-device md # memory disk device (ramdisk) 168pseudo-device md # memory disk device (ramdisk)
169pseudo-device vnd # disk-like interface to files 169pseudo-device vnd # disk-like interface to files
170options VND_COMPRESSION # compressed vnd(4) 170options VND_COMPRESSION # compressed vnd(4)
171#pseudo-device fss # file system snapshot device 171#pseudo-device fss # file system snapshot device
172#pseudo-device putter # for puffs and pud 172#pseudo-device putter # for puffs and pud
cvs diff -r1.56 -r1.57 src/sys/arch/evbarm/conf/ARMADILLO9 (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/ARMADILLO9 2018/05/15 01:24:23 1.56
+++ src/sys/arch/evbarm/conf/ARMADILLO9 2018/06/07 13:36:28 1.57
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: ARMADILLO9,v 1.56 2018/05/15 01:24:23 thorpej Exp $ 1# $NetBSD: ARMADILLO9,v 1.57 2018/06/07 13:36:28 thorpej Exp $
2# 2#
3# ARMADILLO9 -- Atmark Techno, Armadillo-9 3# ARMADILLO9 -- Atmark Techno, Armadillo-9
4# 4#
5 5
6include "arch/evbarm/conf/std.armadillo9" 6include "arch/evbarm/conf/std.armadillo9"
7 7
8#options INCLUDE_CONFIG_FILE # embed config file in kernel binary 8#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
9options MSGBUFSIZE=65536 9options MSGBUFSIZE=65536
10#options KSTACK_CHECK_MAGIC 10#options KSTACK_CHECK_MAGIC
11 11
12# estimated number of users 12# estimated number of users
13maxusers 16 13maxusers 16
14 14
@@ -157,28 +157,28 @@ gpio* at epgpio? @@ -157,28 +157,28 @@ gpio* at epgpio?
157epcom0 at epsoc? addr 0x808c0000 size 0x1000 intr 52 157epcom0 at epsoc? addr 0x808c0000 size 0x1000 intr 52
158epcom1 at epsoc? addr 0x808d0000 size 0x1000 intr 54 158epcom1 at epsoc? addr 0x808d0000 size 0x1000 intr 54
159#epcom2 at epsoc? addr 0x808e0000 size 0x1000 intr 55 159#epcom2 at epsoc? addr 0x808e0000 size 0x1000 intr 55
160# RealTime Clock (no battery backup) 160# RealTime Clock (no battery backup)
161eprtc0 at epsoc? addr 0x80920000 size 0x10c intr 37 161eprtc0 at epsoc? addr 0x80920000 size 0x10c intr 37
162# Watchdog Timer 162# Watchdog Timer
163epwdog0 at epsoc? addr 0x80940000 size 0x08 intr 36 163epwdog0 at epsoc? addr 0x80940000 size 0x08 intr 36
164# LED 164# LED
165epled0 at epgpio0 port 4 bit1 0 bit2 1 165epled0 at epgpio0 port 4 bit1 0 bit2 1
166 166
167# I^2C Controller Unit 167# I^2C Controller Unit
168armadillo9iic0 at epgpio0 port 1 bit1 4 bit2 5 168armadillo9iic0 at epgpio0 port 1 bit1 4 bit2 5
169iic* at armadillo9iic? 169iic* at armadillo9iic?
170seeprom0 at iic0 addr 0x50 size 128 170seeprom0 at iic? addr 0x50 size 128
171#s3531rtc0 at iic0 addr 0x30 171#s3531rtc0 at iic? addr 0x30
172 172
173# PCMCIA bus support 173# PCMCIA bus support
174pcmcia* at eppcic0 controller ? socket ? 174pcmcia* at eppcic0 controller ? socket ?
175 175
176# PCMCIA network interfaces 176# PCMCIA network interfaces
177ne* at pcmcia? function ? # NE2000-compatible Ethernet 177ne* at pcmcia? function ? # NE2000-compatible Ethernet
178wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11) 178wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
179 179
180# MII/PHY support 180# MII/PHY support
181lxtphy* at mii? phy ? # Level One LXT-970 PHYs 181lxtphy* at mii? phy ? # Level One LXT-970 PHYs
182 182
183# PCMCIA serial interfaces 183# PCMCIA serial interfaces
184com* at pcmcia? function ? # Modems and serial cards 184com* at pcmcia? function ? # Modems and serial cards
cvs diff -r1.56 -r1.57 src/sys/arch/evbarm/conf/MPCSA_GENERIC (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/MPCSA_GENERIC 2018/05/15 01:24:23 1.56
+++ src/sys/arch/evbarm/conf/MPCSA_GENERIC 2018/06/07 13:36:28 1.57
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: MPCSA_GENERIC,v 1.56 2018/05/15 01:24:23 thorpej Exp $ 1# $NetBSD: MPCSA_GENERIC,v 1.57 2018/06/07 13:36:28 thorpej Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/evbarm/conf/std.mpcsa" 21include "arch/evbarm/conf/std.mpcsa"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.56 $" 25#ident "GENERIC-$Revision: 1.57 $"
26 26
27maxusers 32 # estimated number of users 27maxusers 32 # estimated number of users
28 28
29# CPU support. 29# CPU support.
30options CPU_ARM9 # Support the ARM9TDMI core 30options CPU_ARM9 # Support the ARM9TDMI core
31makeoptions CPUFLAGS="-mtune=arm920t -mcpu=arm920t" 31makeoptions CPUFLAGS="-mtune=arm920t -mcpu=arm920t"
32 32
33# CPU-related options. 33# CPU-related options.
34#options MATH_EMULATE # floating point emulation 34#options MATH_EMULATE # floating point emulation
35 35
36# doesn't work with MP just yet.. 36# doesn't work with MP just yet..
37#options PERFCTRS # performance-monitoring counters support 37#options PERFCTRS # performance-monitoring counters support
38 38
@@ -292,29 +292,29 @@ seeprom* at iic0 addr 0x50 size 4096 @@ -292,29 +292,29 @@ seeprom* at iic0 addr 0x50 size 4096
292 292
293# Console Devices 293# Console Devices
294 294
295# PCMCIA serial interfaces 295# PCMCIA serial interfaces
296com* at pcmcia? function ? # Modems and serial cards 296com* at pcmcia? function ? # Modems and serial cards
297 297
298pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards 298pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards
299com* at pcmcom? slave ? # ...and the slave devices 299com* at pcmcom? slave ? # ...and the slave devices
300 300
301 301
302# Hardware monitors 302# Hardware monitors
303 303
304# AMD 768 and 8111 power/ACPI controllers 304# AMD 768 and 8111 power/ACPI controllers
305#dbcool* at iic0 addr 0x2C # Unknown other motherboard(s) 305#dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
306#dbcool* at iic0 addr 0x2D # Tyan S2881 306#dbcool* at iic? addr 0x2D # Tyan S2881
307#dbcool* at iic0 addr 0x2E # Tyan S2882-D 307#dbcool* at iic? addr 0x2E # Tyan S2882-D
308 308
309# 1-Wire support 309# 1-Wire support
310#gpioow* at gpio? offset 6 mask 0x1 # 1-wire bitbanging via gpio 310#gpioow* at gpio? offset 6 mask 0x1 # 1-wire bitbanging via gpio
311#onewire* at gpioow? 311#onewire* at gpioow?
312 312
313# 1-Wire devices 313# 1-Wire devices
314#owtemp* at onewire? # Temperature sensors 314#owtemp* at onewire? # Temperature sensors
315 315
316# SCSI Controllers and Devices 316# SCSI Controllers and Devices
317 317
318# PCMCIA SCSI controllers 318# PCMCIA SCSI controllers
319#aic* at pcmcia? function ? # Adaptec APA-1460 SCSI 319#aic* at pcmcia? function ? # Adaptec APA-1460 SCSI
320#esp* at pcmcia? function ? # Qlogic ESP406/FAS408 SCSI 320#esp* at pcmcia? function ? # Qlogic ESP406/FAS408 SCSI
cvs diff -r1.6 -r1.7 src/sys/arch/evbarm/conf/CUBOX (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/CUBOX 2018/05/15 01:24:23 1.6
+++ src/sys/arch/evbarm/conf/CUBOX 2018/06/07 13:36:28 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: CUBOX,v 1.6 2018/05/15 01:24:23 thorpej Exp $ 1# $NetBSD: CUBOX,v 1.7 2018/06/07 13:36:28 thorpej Exp $
2# 2#
3# CUBOX -- SolidRun Ltd. Cubox kernel 3# CUBOX -- SolidRun Ltd. Cubox kernel
4# 4#
5 5
6include "arch/evbarm/conf/std.marvell" 6include "arch/evbarm/conf/std.marvell"
7 7
8#options INCLUDE_CONFIG_FILE # embed config file in kernel binary 8#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
9 9
10# estimated number of users 10# estimated number of users
11 11
12maxusers 32 12maxusers 32
13 13
14# Board Type 14# Board Type
@@ -240,29 +240,29 @@ sdmmc* at sdhc? @@ -240,29 +240,29 @@ sdmmc* at sdhc?
240ld* at sdmmc? 240ld* at sdmmc?
241 241
242# On-chip Serial Peripheral Interface (SPI) 242# On-chip Serial Peripheral Interface (SPI)
243mvspi* at mvsoc? offset ? irq ? 243mvspi* at mvsoc? offset ? irq ?
244spi* at mvspi? 244spi* at mvspi?
245 245
246m25p0 at spi? slave 0 246m25p0 at spi? slave 0
247spiflash0 at spiflashbus? 247spiflash0 at spiflashbus?
248 248
249# On-chip Two-Wire Serial Interface (TWSI) 249# On-chip Two-Wire Serial Interface (TWSI)
250gttwsi* at mvsoc? offset ? irq ? 250gttwsi* at mvsoc? offset ? irq ?
251iic* at gttwsi? 251iic* at gttwsi?
252 252
253#TDA998x at iic0 addr 0x34 # HDMI transmitters 253#TDA998x at iic? addr 0x34 # HDMI transmitters
254#Si5351A at iic0 addr 0x60 # Programmable Any-Frequency CMOS Clock Generator 254#Si5351A at iic? addr 0x60 # Programmable Any-Frequency CMOS Clock Generator
255#lcdc at iic0 addr 0x70 255#lcdc at iic? addr 0x70
256 256
257# On-chip UART Interface 257# On-chip UART Interface
258com* at mvsoc? offset ? irq ? 258com* at mvsoc? offset ? irq ?
259 259
260# On-chip Real Time Clock (RTC) 260# On-chip Real Time Clock (RTC)
261mvsocrtc* at mvsoc? offset ? irq ? 261mvsocrtc* at mvsoc? offset ? irq ?
262 262
263# On-chip Timers 263# On-chip Timers
264mvsoctmr* at mvsoc? offset ? irq ? 264mvsoctmr* at mvsoc? offset ? irq ?
265 265
266 266
267# USB bus support 267# USB bus support
268usb* at ehci? 268usb* at ehci?
cvs diff -r1.10 -r1.11 src/sys/arch/evbarm/conf/DNS323 (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/DNS323 2018/05/15 01:24:23 1.10
+++ src/sys/arch/evbarm/conf/DNS323 2018/06/07 13:36:28 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: DNS323,v 1.10 2018/05/15 01:24:23 thorpej Exp $ 1# $NetBSD: DNS323,v 1.11 2018/06/07 13:36:28 thorpej Exp $
2# 2#
3# DNS323 -- D-Link. DNS-323 platform kernel 3# DNS323 -- D-Link. DNS-323 platform kernel
4# 4#
5 5
6include "arch/evbarm/conf/MARVELL_NAS" 6include "arch/evbarm/conf/MARVELL_NAS"
7 7
8# Board Type 8# Board Type
9makeoptions BOARDTYPE="dns323" 9makeoptions BOARDTYPE="dns323"
10options EVBARM_BOARDTYPE=dns323 10options EVBARM_BOARDTYPE=dns323
11 11
12makeoptions CPUFLAGS="-mcpu=xscale" # Xscale instruction set support 12makeoptions CPUFLAGS="-mcpu=xscale" # Xscale instruction set support
13no options CPU_SHEEVA 13no options CPU_SHEEVA
14 14
@@ -20,18 +20,18 @@ options DEBUG @@ -20,18 +20,18 @@ options DEBUG
20#options PMAP_DEBUG # Enable pmap_debug_level code 20#options PMAP_DEBUG # Enable pmap_debug_level code
21#options VERBOSE_INIT_ARM # verbose bootstraping messages 21#options VERBOSE_INIT_ARM # verbose bootstraping messages
22#options DDB # in-kernel debugger 22#options DDB # in-kernel debugger
23#pseudo-device ksyms 23#pseudo-device ksyms
24#options DDB_HISTORY_SIZE=100 # Enable history editing in DDB 24#options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
25#options KGDB 25#options KGDB
26#options DEBUG_KGDB 26#options DEBUG_KGDB
27makeoptions DEBUG="-g" # compile full symbol table 27makeoptions DEBUG="-g" # compile full symbol table
28#makeoptions COPTS="-O2" 28#makeoptions COPTS="-O2"
29makeoptions COPY_SYMTAB=1 29makeoptions COPY_SYMTAB=1
30#options AUDIO_DEBUG=2 30#options AUDIO_DEBUG=2
31 31
32 32
33g760a* at iic0 addr 0x3e # G760a fan speed controller 33g760a* at iic? addr 0x3e # G760a fan speed controller
34lmtemp* at iic0 addr 0x48 # LM75 temperature sensor 34lmtemp* at iic? addr 0x48 # LM75 temperature sensor
35strtc* at iic0 addr 0x68 # ST M41T80 Real-Time Clock 35strtc* at iic? addr 0x68 # ST M41T80 Real-Time Clock
36options STRTC_NO_USERRAM 36options STRTC_NO_USERRAM
37options STRTC_NO_WATCHDOG 37options STRTC_NO_WATCHDOG
cvs diff -r1.95 -r1.96 src/sys/arch/evbarm/conf/GUMSTIX (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/GUMSTIX 2018/05/15 01:24:23 1.95
+++ src/sys/arch/evbarm/conf/GUMSTIX 2018/06/07 13:36:28 1.96
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: GUMSTIX,v 1.95 2018/05/15 01:24:23 thorpej Exp $ 1# $NetBSD: GUMSTIX,v 1.96 2018/06/07 13:36:28 thorpej Exp $
2# 2#
3# GUMSTIX -- Gumstix. Inc. gumstix platforms kernel 3# GUMSTIX -- Gumstix. Inc. gumstix platforms kernel
4# 4#
5 5
6include "arch/evbarm/conf/std.gumstix" 6include "arch/evbarm/conf/std.gumstix"
7 7
8#options INCLUDE_CONFIG_FILE # embed config file in kernel binary 8#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
9 9
10# estimated number of users 10# estimated number of users
11 11
12maxusers 32 12maxusers 32
13 13
14# CPU options 14# CPU options
@@ -219,27 +219,27 @@ options GXIO_BLUETOOTH_ON_HWUART # Blue @@ -219,27 +219,27 @@ options GXIO_BLUETOOTH_ON_HWUART # Blue
219 219
220# SMC 91C111 220# SMC 91C111
221sm0 at gxio? addr 0x04000300 gpirq ? 221sm0 at gxio? addr 0x04000300 gpirq ?
222#sm0 at gxio? addr 0x04000300 gpirq 36 # etherstix,netMMC,netCF,netDUO 222#sm0 at gxio? addr 0x04000300 gpirq 36 # etherstix,netMMC,netCF,netDUO
223#sm0 at gxio? addr 0x04000300 gpirq 99 # netCF-vx 223#sm0 at gxio? addr 0x04000300 gpirq 99 # netCF-vx
224sm1 at gxio? addr 0x08000300 gpirq 27 # netDUO(2nd NIC) 224sm1 at gxio? addr 0x08000300 gpirq 27 # netDUO(2nd NIC)
225 225
226# SMSC LAN9117 226# SMSC LAN9117
227smsh0 at gxio? addr 0x04000300 gpirq 99 # netmicroSD-vx, netpro-vx 227smsh0 at gxio? addr 0x04000300 gpirq 99 # netmicroSD-vx, netpro-vx
228 228
229# Inter-Integrated Circuit controller 229# Inter-Integrated Circuit controller
230gxiic0 at pxaip? addr 0x40300000 230gxiic0 at pxaip? addr 0x40300000
231iic* at gxiic? 231iic* at gxiic?
232#dsrtc* at iic0 addr 0x68 # Can mount DS1307 at console, breakout 232#dsrtc* at iic? addr 0x68 # Can mount DS1307 at console, breakout
233 233
234# integrated PCMCIA/CF controller 234# integrated PCMCIA/CF controller
235pxapcic0 at pxaip? addr 0x20000000 # cfstix, netCF 235pxapcic0 at pxaip? addr 0x20000000 # cfstix, netCF
236 236
237# PCMCIA bus support 237# PCMCIA bus support
238pcmcia* at pxapcic? 238pcmcia* at pxapcic?
239 239
240# Marvell 88W8385 240# Marvell 88W8385
241malo* at pcmcia? function ? # wifistix, netwifimicrosd, netpro-vx 241malo* at pcmcia? function ? # wifistix, netwifimicrosd, netpro-vx
242 242
243 243
244# PCMCIA serial interfaces 244# PCMCIA serial interfaces
245com* at pcmcia? function ? # Modems and serial cards 245com* at pcmcia? function ? # Modems and serial cards
cvs diff -r1.9 -r1.10 src/sys/arch/evbarm/conf/KUROBOX_PRO (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/KUROBOX_PRO 2018/05/15 01:24:23 1.9
+++ src/sys/arch/evbarm/conf/KUROBOX_PRO 2018/06/07 13:36:28 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: KUROBOX_PRO,v 1.9 2018/05/15 01:24:23 thorpej Exp $ 1# $NetBSD: KUROBOX_PRO,v 1.10 2018/06/07 13:36:28 thorpej Exp $
2# 2#
3# KUROBOX_PRO -- KUROUTOSHIKOU. KURO-BOX/PRO platform kernel 3# KUROBOX_PRO -- KUROUTOSHIKOU. KURO-BOX/PRO platform kernel
4# 4#
5 5
6include "arch/evbarm/conf/MARVELL_NAS" 6include "arch/evbarm/conf/MARVELL_NAS"
7 7
8# Board Type 8# Board Type
9makeoptions BOARDTYPE="kurobox_pro" 9makeoptions BOARDTYPE="kurobox_pro"
10options EVBARM_BOARDTYPE=kurobox_pro 10options EVBARM_BOARDTYPE=kurobox_pro
11 11
12makeoptions CPUFLAGS="-mcpu=xscale" # Xscale instruction set support 12makeoptions CPUFLAGS="-mcpu=xscale" # Xscale instruction set support
13no options CPU_SHEEVA 13no options CPU_SHEEVA
14no options KIRKWOOD 14no options KIRKWOOD
@@ -26,18 +26,18 @@ options DEBUG @@ -26,18 +26,18 @@ options DEBUG
26#options DDB_HISTORY_SIZE=100 # Enable history editing in DDB 26#options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
27#options KGDB 27#options KGDB
28#options DEBUG_KGDB 28#options DEBUG_KGDB
29makeoptions DEBUG="-g" # compile full symbol table 29makeoptions DEBUG="-g" # compile full symbol table
30#makeoptions COPTS="-O2" 30#makeoptions COPTS="-O2"
31makeoptions COPY_SYMTAB=1 31makeoptions COPY_SYMTAB=1
32#options AUDIO_DEBUG=2 32#options AUDIO_DEBUG=2
33 33
34 34
35# On-chip PCI Interface doesn't use. 35# On-chip PCI Interface doesn't use.
36no gtpci* at mvsoc? 36no gtpci* at mvsoc?
37no pci* at gtpci? 37no pci* at gtpci?
38 38
39rs5c372rtc* at iic0 addr 0x32 # RICOH RS5C372 RTC 39rs5c372rtc* at iic? addr 0x32 # RICOH RS5C372 RTC
40 40
41# PCI network interfaces 41# PCI network interfaces
42#mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet 42#mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet
43#msk* at mskc? 43#msk* at mskc?
cvs diff -r1.2 -r1.3 src/sys/arch/evbarm/conf/KURONAS_X4 (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/KURONAS_X4 2018/05/15 01:24:23 1.2
+++ src/sys/arch/evbarm/conf/KURONAS_X4 2018/06/07 13:36:28 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: KURONAS_X4,v 1.2 2018/05/15 01:24:23 thorpej Exp $ 1# $NetBSD: KURONAS_X4,v 1.3 2018/06/07 13:36:28 thorpej Exp $
2# 2#
3# KUROBOX_PRO -- KUROUTOSHIKOU. KURO-BOX/PRO platform kernel 3# KUROBOX_PRO -- KUROUTOSHIKOU. KURO-BOX/PRO platform kernel
4# 4#
5 5
6include "arch/evbarm/conf/MARVELL_NAS" 6include "arch/evbarm/conf/MARVELL_NAS"
7 7
8# Board Type 8# Board Type
9makeoptions BOARDTYPE="kuronas_x4" 9makeoptions BOARDTYPE="kuronas_x4"
10options EVBARM_BOARDTYPE=kuronas_x4 10options EVBARM_BOARDTYPE=kuronas_x4
11 11
12makeoptions CPUFLAGS="-mcpu=xscale" # Xscale instruction set support 12makeoptions CPUFLAGS="-mcpu=xscale" # Xscale instruction set support
13no options CPU_SHEEVA 13no options CPU_SHEEVA
14no options KIRKWOOD 14no options KIRKWOOD
@@ -22,18 +22,18 @@ config netbsd-wd0 root on wd0 type ffs @@ -22,18 +22,18 @@ config netbsd-wd0 root on wd0 type ffs
22options DIAGNOSTIC # internal consistency checks 22options DIAGNOSTIC # internal consistency checks
23options DEBUG 23options DEBUG
24#options PMAP_DEBUG # Enable pmap_debug_level code 24#options PMAP_DEBUG # Enable pmap_debug_level code
25#options VERBOSE_INIT_ARM # verbose bootstraping messages 25#options VERBOSE_INIT_ARM # verbose bootstraping messages
26#options DDB_HISTORY_SIZE=100 # Enable history editing in DDB 26#options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
27#options KGDB 27#options KGDB
28#options DEBUG_KGDB 28#options DEBUG_KGDB
29makeoptions DEBUG="-g" # compile full symbol table 29makeoptions DEBUG="-g" # compile full symbol table
30#makeoptions COPTS="-O2" 30#makeoptions COPTS="-O2"
31makeoptions COPY_SYMTAB=1 31makeoptions COPY_SYMTAB=1
32#options AUDIO_DEBUG=2 32#options AUDIO_DEBUG=2
33 33
34 34
35rs5c372rtc* at iic0 addr 0x32 # RICOH RS5C372 RTC 35rs5c372rtc* at iic? addr 0x32 # RICOH RS5C372 RTC
36 36
37# PCI network interfaces 37# PCI network interfaces
38#mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet 38#mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet
39#msk* at mskc? 39#msk* at mskc?
cvs diff -r1.35 -r1.36 src/sys/arch/evbarm/conf/MMNET_GENERIC (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/MMNET_GENERIC 2018/05/15 01:24:23 1.35
+++ src/sys/arch/evbarm/conf/MMNET_GENERIC 2018/06/07 13:36:28 1.36
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: MMNET_GENERIC,v 1.35 2018/05/15 01:24:23 thorpej Exp $ 1# $NetBSD: MMNET_GENERIC,v 1.36 2018/06/07 13:36:28 thorpej Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/evbarm/conf/std.mmnet" 21include "arch/evbarm/conf/std.mmnet"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.35 $" 25#ident "GENERIC-$Revision: 1.36 $"
26 26
27maxusers 32 # estimated number of users 27maxusers 32 # estimated number of users
28 28
29# CPU support. 29# CPU support.
30options CPU_ARM9E 30options CPU_ARM9E
31makeoptions CPUFLAGS="-mtune=arm926ej-s -mcpu=arm926ej-s" 31makeoptions CPUFLAGS="-mtune=arm926ej-s -mcpu=arm926ej-s"
32 32
33# CPU-related options. 33# CPU-related options.
34#options MATH_EMULATE # floating point emulation 34#options MATH_EMULATE # floating point emulation
35 35
36# doesn't work with MP just yet.. 36# doesn't work with MP just yet..
37#options PERFCTRS # performance-monitoring counters support 37#options PERFCTRS # performance-monitoring counters support
38 38
@@ -278,29 +278,29 @@ ohci0 at at91bus0 addr 0x00500000 size  @@ -278,29 +278,29 @@ ohci0 at at91bus0 addr 0x00500000 size
278#spi0 at at91spi0 278#spi0 at at91spi0
279#spi_obuf0 at spi0 slave 1 279#spi_obuf0 at spi0 slave 1
280#gpio* at spi_obuf? 280#gpio* at spi_obuf?
281 281
282# On-chip I2C 282# On-chip I2C
283at91twi0 at at91bus0 addr 0xfffac000 size 0x4000 pid 11 283at91twi0 at at91bus0 addr 0xfffac000 size 0x4000 pid 11
284iic0 at at91twi? 284iic0 at at91twi?
285#ds1672rtc* at iic0 addr 0x68 285#ds1672rtc* at iic0 addr 0x68
286#seeprom* at iic0 addr 0x50 size 4096 286#seeprom* at iic0 addr 0x50 size 4096
287 287
288# Hardware monitors 288# Hardware monitors
289 289
290# AMD 768 and 8111 power/ACPI controllers 290# AMD 768 and 8111 power/ACPI controllers
291#dbcool* at iic0 addr 0x2C # Unknown other motherboard(s) 291#dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
292#dbcool* at iic0 addr 0x2D # Tyan S2881 292#dbcool* at iic? addr 0x2D # Tyan S2881
293#dbcool* at iic0 addr 0x2E # Tyan S2882-D 293#dbcool* at iic? addr 0x2E # Tyan S2882-D
294 294
295# 1-Wire support 295# 1-Wire support
296#gpioow* at gpio? offset 6 mask 0x1 # 1-wire bitbanging via gpio 296#gpioow* at gpio? offset 6 mask 0x1 # 1-wire bitbanging via gpio
297#onewire* at gpioow? 297#onewire* at gpioow?
298 298
299# 1-Wire devices 299# 1-Wire devices
300#owtemp* at onewire? # Temperature sensors 300#owtemp* at onewire? # Temperature sensors
301 301
302# SCSI Controllers and Devices 302# SCSI Controllers and Devices
303 303
304# SCSI bus support 304# SCSI bus support
305scsibus* at scsi? 305scsibus* at scsi?
306 306
cvs diff -r1.36 -r1.37 src/sys/arch/evbarm/conf/MV2120 (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/MV2120 2018/05/15 01:24:23 1.36
+++ src/sys/arch/evbarm/conf/MV2120 2018/06/07 13:36:28 1.37
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: MV2120,v 1.36 2018/05/15 01:24:23 thorpej Exp $ 1# $NetBSD: MV2120,v 1.37 2018/06/07 13:36:28 thorpej Exp $
2# 2#
3# This configuration supports for HP MV2120/MV5140/MV5150. 3# This configuration supports for HP MV2120/MV5140/MV5150.
4 4
5include "arch/evbarm/conf/std.mv2120" 5include "arch/evbarm/conf/std.mv2120"
6 6
7options INCLUDE_CONFIG_FILE # embed config file in kernel binary 7options INCLUDE_CONFIG_FILE # embed config file in kernel binary
8makeoptions COPY_SYMTAB=1 8makeoptions COPY_SYMTAB=1
9 9
10makeoptions DEBUG="-g" 10makeoptions DEBUG="-g"
11 11
12# estimated number of users 12# estimated number of users
13 13
14maxusers 32 14maxusers 32
@@ -186,27 +186,27 @@ iic* at gttwsi? # I2C bus @@ -186,27 +186,27 @@ iic* at gttwsi? # I2C bus
186com* at mvsoc? offset ? irq ? 186com* at mvsoc? offset ? irq ?
187 187
188# On-chip IDMA Controller 188# On-chip IDMA Controller
189#gtidmac* at mvsoc? offset ? irq ? 189#gtidmac* at mvsoc? offset ? irq ?
190 190
191# On-chip General Purpose I/O Port Interface 191# On-chip General Purpose I/O Port Interface
192mvsocgpp* at mvsoc? offset ? irq ? 192mvsocgpp* at mvsoc? offset ? irq ?
193gpio* at mvsocgpp? 193gpio* at mvsocgpp?
194 194
195# On-chip Timers 195# On-chip Timers
196mvsoctmr* at mvsoc? offset ? irq ? 196mvsoctmr* at mvsoc? offset ? irq ?
197 197
198# Real Time Clock 198# Real Time Clock
199pcf8563rtc* at iic0 addr 0x51 199pcf8563rtc* at iic? addr 0x51
200 200
201# MII/PHY support 201# MII/PHY support
202makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs 202makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs
203 203
204# ATA (IDE) bus support 204# ATA (IDE) bus support
205atabus* at ata? 205atabus* at ata?
206#options ATADEBUG 206#options ATADEBUG
207 207
208# IDE drives 208# IDE drives
209wd0 at atabus0 drive 0 flags 0x0000 209wd0 at atabus0 drive 0 flags 0x0000
210wd1 at atabus1 drive 0 flags 0x0000 210wd1 at atabus1 drive 0 flags 0x0000
211wd* at atabus? drive ? flags 0x0000 211wd* at atabus? drive ? flags 0x0000
212 212
cvs diff -r1.93 -r1.94 src/sys/arch/evbarm/conf/TEAMASA_NPWR (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/TEAMASA_NPWR 2018/05/15 01:24:23 1.93
+++ src/sys/arch/evbarm/conf/TEAMASA_NPWR 2018/06/07 13:36:28 1.94
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: TEAMASA_NPWR,v 1.93 2018/05/15 01:24:23 thorpej Exp $ 1# $NetBSD: TEAMASA_NPWR,v 1.94 2018/06/07 13:36:28 thorpej Exp $
2# 2#
3# TEAMASA_NPWR -- Team ASA, Inc. Npwr -- XScale/IOP310-based 3# TEAMASA_NPWR -- Team ASA, Inc. Npwr -- XScale/IOP310-based
4# server appliance. 4# server appliance.
5# 5#
6 6
7include "arch/evbarm/conf/std.iq80310" 7include "arch/evbarm/conf/std.iq80310"
8options IOP310_TEAMASA_NPWR # Enable Npwr support 8options IOP310_TEAMASA_NPWR # Enable Npwr support
9 9
10#options INCLUDE_CONFIG_FILE # embed config file in kernel binary 10#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
11 11
12# estimated number of users 12# estimated number of users
13 13
14maxusers 32 14maxusers 32
@@ -136,27 +136,27 @@ mainbus0 at root @@ -136,27 +136,27 @@ mainbus0 at root
136cpu0 at mainbus? 136cpu0 at mainbus?
137 137
138# On-board device support 138# On-board device support
139obio* at mainbus? 139obio* at mainbus?
140 140
141# On-board 16550 UART 141# On-board 16550 UART
142com0 at obio? addr 0xfe810000 xint3 3 142com0 at obio? addr 0xfe810000 xint3 3
143 143
144# i80312 Companion I/O support 144# i80312 Companion I/O support
145iopxs* at mainbus? 145iopxs* at mainbus?
146 146
147iopiic* at iopxs? # I2C Controller Unit 147iopiic* at iopxs? # I2C Controller Unit
148iic* at iopiic? 148iic* at iopiic?
149m41trtc* at iic0 addr 0x68 149m41trtc* at iic? addr 0x68
150 150
151pci* at iopxs? bus ? 151pci* at iopxs? bus ?
152 152
153# 153#
154# Networking devices 154# Networking devices
155# 155#
156 156
157# PCI network devices 157# PCI network devices
158wm* at pci? dev ? function ? 158wm* at pci? dev ? function ?
159 159
160# MII/PHY support 160# MII/PHY support
161makphy* at mii? phy ? # Marvell "Alaska" Gig-E PHY 161makphy* at mii? phy ? # Marvell "Alaska" Gig-E PHY
162ukphy* at mii? phy ? # Generic IEEE 802.3u PHYs 162ukphy* at mii? phy ? # Generic IEEE 802.3u PHYs
cvs diff -r1.16 -r1.17 src/sys/arch/evbarm/conf/Attic/VTC100 (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/Attic/VTC100 2018/05/15 01:24:23 1.16
+++ src/sys/arch/evbarm/conf/Attic/VTC100 2018/06/07 13:36:28 1.17
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# 1#
2# $NetBSD: VTC100,v 1.16 2018/05/15 01:24:23 thorpej Exp $ 2# $NetBSD: VTC100,v 1.17 2018/06/07 13:36:28 thorpej Exp $
3# 3#
4# VTC100 -- NEXCOM VTC100 Kernel 4# VTC100 -- NEXCOM VTC100 Kernel
5# 5#
6 6
7include "arch/evbarm/conf/std.beagle" 7include "arch/evbarm/conf/std.beagle"
8 8
9# estimated number of users 9# estimated number of users
10 10
11maxusers 32 11maxusers 32
12 12
13# Standard system options 13# Standard system options
14 14
15options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT 15options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
@@ -183,32 +183,32 @@ ld* at sdmmc? @@ -183,32 +183,32 @@ ld* at sdmmc?
183# General-purpose I/O pins 183# General-purpose I/O pins
184omapgpio0 at obio0 addr 0x44e07000 size 0x1000 184omapgpio0 at obio0 addr 0x44e07000 size 0x1000
185gpio0 at omapgpio0 185gpio0 at omapgpio0
186omapgpio1 at obio1 addr 0x4804c000 size 0x1000 186omapgpio1 at obio1 addr 0x4804c000 size 0x1000
187gpio1 at omapgpio1 187gpio1 at omapgpio1
188omapgpio2 at obio1 addr 0x481ac000 size 0x1000 188omapgpio2 at obio1 addr 0x481ac000 size 0x1000
189gpio2 at omapgpio2 189gpio2 at omapgpio2
190omapgpio3 at obio1 addr 0x481ae000 size 0x1000 190omapgpio3 at obio1 addr 0x481ae000 size 0x1000
191gpio3 at omapgpio3 191gpio3 at omapgpio3
192 192
193# I2C Controller 193# I2C Controller
194tiiic0 at obio0 addr 0x44e0b000 size 0x1000 intr 70 194tiiic0 at obio0 addr 0x44e0b000 size 0x1000 intr 70
195iic* at tiiic? 195iic* at tiiic?
196#? at iic0 addr 0x00 196#? at iic? addr 0x00
197#tps65910pmic0 at iic0 addr 0x12 # TPS65910 ID0 (SmartReflex) 197#tps65910pmic0 at iic? addr 0x12 # TPS65910 ID0 (SmartReflex)
198#tlv320aic3x at iic0 addr 0x18 # TLV320AIC3x 198#tlv320aic3x at iic? addr 0x18 # TLV320AIC3x
199#tps65910pmic1 at iic0 addr 0x2d # TPS65910 ID1 # RTC 199#tps65910pmic1 at iic? addr 0x2d # TPS65910 ID1 # RTC
200#micon at iic0 addr 0x5a 200#micon at iic? addr 0x5a
201#? at iic0 addr 0x76 201#? at iic? addr 0x76
202 202
203# On-board 16550 UARTs 203# On-board 16550 UARTs
204com0 at obio1 addr 0x48022000 size 0x1000 intr 73 mult 4 # UART1 204com0 at obio1 addr 0x48022000 size 0x1000 intr 73 mult 4 # UART1
205options CONSADDR=0x48022000, CONSPEED=115200 205options CONSADDR=0x48022000, CONSPEED=115200
206# GPS 206# GPS
207com1 at obio1 addr 0x481a6000 size 0x1000 intr 44 mult 4 # UART3 207com1 at obio1 addr 0x481a6000 size 0x1000 intr 44 mult 4 # UART3
208 208
209# XXX Clock assignment is kinda random. My DM timer 3 seems to be 209# XXX Clock assignment is kinda random. My DM timer 3 seems to be
210# unhappy and I don't know why. DM timer 0 doesn't seem to deliver 210# unhappy and I don't know why. DM timer 0 doesn't seem to deliver
211# interrupts for the hard clock, although it seems to be the obvious 211# interrupts for the hard clock, although it seems to be the obvious
212# choice. 212# choice.
213 213
214# Hardclock timer 214# Hardclock timer
cvs diff -r1.30 -r1.31 src/sys/arch/evbmips/conf/GDIUM (expand / switch to unified diff)

--- src/sys/arch/evbmips/conf/GDIUM 2018/05/14 21:50:02 1.30
+++ src/sys/arch/evbmips/conf/GDIUM 2018/06/07 13:36:29 1.31
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GDIUM,v 1.30 2018/05/14 21:50:02 thorpej Exp $ 1# $NetBSD: GDIUM,v 1.31 2018/06/07 13:36:29 thorpej Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4#  4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/evbmips/conf/std.gdium" 21include "arch/evbmips/conf/std.gdium"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GDIUM-$Revision: 1.30 $" 25#ident "GDIUM-$Revision: 1.31 $"
26 26
27maxusers 16 27maxusers 16
28 28
29makeoptions CPUFLAGS="-mips3 -mdivide-breaks" # CPU codegen options 29makeoptions CPUFLAGS="-mips3 -mdivide-breaks" # CPU codegen options
30options LOONGSON2 # IDT LOONGSON2 30options LOONGSON2 # IDT LOONGSON2
31# Standard system options 31# Standard system options
32options DDB # in-kernel debugger 32options DDB # in-kernel debugger
33#options DDB_ONPANIC=0 # don't enter debugger on panic 33#options DDB_ONPANIC=0 # don't enter debugger on panic
34options DDB_HISTORY_SIZE=512 # enable history editing in DDB 34options DDB_HISTORY_SIZE=512 # enable history editing in DDB
35#options KGDB # remote debugger 35#options KGDB # remote debugger
36options DIAGNOSTIC # extra kernel debugging checks 36options DIAGNOSTIC # extra kernel debugging checks
37#options DEBUG # extra kernel debugging support 37#options DEBUG # extra kernel debugging support
38makeoptions DEBUG="-g" 38makeoptions DEBUG="-g"
@@ -142,31 +142,31 @@ options FONT_GALLANT12x22 @@ -142,31 +142,31 @@ options FONT_GALLANT12x22
142options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes 142options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
143# 143#
144# Hpckbd will set key board layout appropriately. You can use option 144# Hpckbd will set key board layout appropriately. You can use option
145# 'PCKBD_LAYOUT' to overrite the default layout. 145# 'PCKBD_LAYOUT' to overrite the default layout.
146# 146#
147#options PCKBD_LAYOUT="(KB_US | KB_SWAPCTRLCAPS | KB_MACHDEP)" 147#options PCKBD_LAYOUT="(KB_US | KB_SWAPCTRLCAPS | KB_MACHDEP)"
148 148
149mainbus0 at root 149mainbus0 at root
150cpu0 at mainbus0 150cpu0 at mainbus0
151bonito0 at mainbus0 151bonito0 at mainbus0
152pci0 at bonito0 152pci0 at bonito0
153voyager0 at pci0 dev ? function ? 153voyager0 at pci0 dev ? function ?
154voyagerfb0 at voyager0 154voyagerfb0 at voyager0
155iic0 at voyager0 155iic* at voyager0
156strtc* at iic0 addr 0x68 156strtc* at iic? addr 0x68
157options STRTC_NO_USERRAM 157options STRTC_NO_USERRAM
158lmtemp* at iic0 addr 0x48 158lmtemp* at iic? addr 0x48
159#stvii* at iic0 addr 0x40 159#stvii* at iic? addr 0x40
160#genfb0 at pci0 dev ? function ? 160#genfb0 at pci0 dev ? function ?
161wsdisplay0 at wsemuldisplaydev? 161wsdisplay0 at wsemuldisplaydev?
162ehci* at pci0 dev ? function ? 162ehci* at pci0 dev ? function ?
163#options EHCI_DEBUG 163#options EHCI_DEBUG
164ohci* at pci0 dev ? function ? 164ohci* at pci0 dev ? function ?
165#options OHCI_DEBUG, USB_DEBUG, UHUB_DEBUG 165#options OHCI_DEBUG, USB_DEBUG, UHUB_DEBUG
166 166
167ral* at pci0 dev ? function ? # RL2561S 802.11b/g 167ral* at pci0 dev ? function ? # RL2561S 802.11b/g
168rtk* at pci0 dev ? function ? # RTL8139 100/10 Ethernet 168rtk* at pci0 dev ? function ? # RTL8139 100/10 Ethernet
169# MII/PHY support 169# MII/PHY support
170ukphy* at mii? phy ? # generic unknown PHYs 170ukphy* at mii? phy ? # generic unknown PHYs
171 171
172# USB Hubs 172# USB Hubs
cvs diff -r1.37 -r1.38 src/sys/arch/evbmips/conf/LOONGSON (expand / switch to unified diff)

--- src/sys/arch/evbmips/conf/LOONGSON 2018/05/14 21:50:02 1.37
+++ src/sys/arch/evbmips/conf/LOONGSON 2018/06/07 13:36:29 1.38
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: LOONGSON,v 1.37 2018/05/14 21:50:02 thorpej Exp $ 1# $NetBSD: LOONGSON,v 1.38 2018/06/07 13:36:29 thorpej Exp $
2# 2#
3# LOONGSON machine description file 3# LOONGSON machine description file
4#  4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/evbmips/conf/std.loongson" 21include "arch/evbmips/conf/std.loongson"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "LOONGSON-$Revision: 1.37 $" 25#ident "LOONGSON-$Revision: 1.38 $"
26 26
27maxusers 16 27maxusers 16
28 28
29# Standard system options 29# Standard system options
30options DDB # in-kernel debugger 30options DDB # in-kernel debugger
31#options DDB_ONPANIC=0 # don't enter debugger on panic 31#options DDB_ONPANIC=0 # don't enter debugger on panic
32options DDB_HISTORY_SIZE=512 # enable history editing in DDB 32options DDB_HISTORY_SIZE=512 # enable history editing in DDB
33#options KGDB # remote debugger 33#options KGDB # remote debugger
34options DIAGNOSTIC # extra kernel debugging checks 34options DIAGNOSTIC # extra kernel debugging checks
35#options DEBUG # extra kernel debugging support 35#options DEBUG # extra kernel debugging support
36#options PMAP_FAULTINFO 36#options PMAP_FAULTINFO
37#options LOCKDEBUG 37#options LOCKDEBUG
38makeoptions DEBUG="-g" 38makeoptions DEBUG="-g"
@@ -158,31 +158,31 @@ options WSDISPLAY_COMPAT_RAWKBD # can  @@ -158,31 +158,31 @@ options WSDISPLAY_COMPAT_RAWKBD # can
158# Hpckbd will set key board layout appropriately. You can use option 158# Hpckbd will set key board layout appropriately. You can use option
159# 'PCKBD_LAYOUT' to overrite the default layout. 159# 'PCKBD_LAYOUT' to overrite the default layout.
160# 160#
161#options PCKBD_LAYOUT="(KB_US | KB_SWAPCTRLCAPS | KB_MACHDEP)" 161#options PCKBD_LAYOUT="(KB_US | KB_SWAPCTRLCAPS | KB_MACHDEP)"
162 162
163mainbus0 at root 163mainbus0 at root
164cpu0 at mainbus0 164cpu0 at mainbus0
165bonito0 at mainbus0 165bonito0 at mainbus0
166pci0 at bonito0 166pci0 at bonito0
167sisfb0 at pci0 dev ? function ? 167sisfb0 at pci0 dev ? function ?
168voyager0 at pci0 dev ? function ? # SM502 on GDIUM 168voyager0 at pci0 dev ? function ? # SM502 on GDIUM
169voyagerfb0 at voyager0 # framebuffer portion 169voyagerfb0 at voyager0 # framebuffer portion
170pwmclock0 at voyager0 # clock and CPU freq scaling 170pwmclock0 at voyager0 # clock and CPU freq scaling
171iic0 at voyager0 171iic* at voyager0
172strtc* at iic0 addr 0x68 # GDIUM's real time clock 172strtc* at iic? addr 0x68 # GDIUM's real time clock
173options STRTC_NO_USERRAM 173options STRTC_NO_USERRAM
174lmtemp* at iic0 addr 0x48 # GDIUM's temperature sensor 174lmtemp* at iic? addr 0x48 # GDIUM's temperature sensor
175stvii* at iic0 addr 0x40 # GDIUM's onboard microcontroller 175stvii* at iic? addr 0x40 # GDIUM's onboard microcontroller
176lynxfb0 at pci0 dev ? function ? # SM712 on Yeeloong Notebook 176lynxfb0 at pci0 dev ? function ? # SM712 on Yeeloong Notebook
177#genfb0 at pci0 dev ? function ? 177#genfb0 at pci0 dev ? function ?
178wsdisplay* at wsemuldisplaydev? 178wsdisplay* at wsemuldisplaydev?
179 179
180ehci* at pci0 dev ? function ? 180ehci* at pci0 dev ? function ?
181#options EHCI_DEBUG 181#options EHCI_DEBUG
182ohci* at pci0 dev ? function ? 182ohci* at pci0 dev ? function ?
183#options OHCI_DEBUG, USB_DEBUG, UHUB_DEBUG 183#options OHCI_DEBUG, USB_DEBUG, UHUB_DEBUG
184 184
185# USB 185# USB
186usb* at ehci? 186usb* at ehci?
187usb* at ohci? 187usb* at ohci?
188 188
cvs diff -r1.23 -r1.24 src/sys/arch/hpcarm/conf/NETBOOKPRO (expand / switch to unified diff)

--- src/sys/arch/hpcarm/conf/NETBOOKPRO 2018/05/14 21:58:14 1.23
+++ src/sys/arch/hpcarm/conf/NETBOOKPRO 2018/06/07 13:36:29 1.24
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: NETBOOKPRO,v 1.23 2018/05/14 21:58:14 thorpej Exp $ 1# $NetBSD: NETBOOKPRO,v 1.24 2018/06/07 13:36:29 thorpej Exp $
2# 2#
3# NETBOOKPRO -- Psion Teklogix NETBOOK PRO 3# NETBOOKPRO -- Psion Teklogix NETBOOK PRO
4# 4#
5 5
6include "arch/hpcarm/conf/std.pxa2x0" 6include "arch/hpcarm/conf/std.pxa2x0"
7include "arch/hpcarm/conf/files.netbookpro" 7include "arch/hpcarm/conf/files.netbookpro"
8 8
9#options INCLUDE_CONFIG_FILE # embed config file in kernel binary 9#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
10 10
11#ident "GENERIC-$Revision: 1.23 $" 11#ident "GENERIC-$Revision: 1.24 $"
12 12
13# estimated number of users 13# estimated number of users
14maxusers 32 14maxusers 32
15 15
16# in-kernel bootloader, see kloader(4) 16# in-kernel bootloader, see kloader(4)
17options KLOADER 17options KLOADER
18#options KLOADER_KERNEL_PATH="\"/netbsd\"" 18#options KLOADER_KERNEL_PATH="\"/netbsd\""
19#options KLOADER_DEBUG 19#options KLOADER_DEBUG
20 20
21# Standard system options 21# Standard system options
22 22
23#options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT 23#options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
24 # (default timezone is passed from hpcboot) 24 # (default timezone is passed from hpcboot)
@@ -165,29 +165,29 @@ saost* at pxaip? addr 0x40a00000 size 0x @@ -165,29 +165,29 @@ saost* at pxaip? addr 0x40a00000 size 0x
165 165
166# AC97 Audio support 166# AC97 Audio support
167pxaacu0 at pxaip? addr 0x40500000 intr 14 # Wolfson WM97xx 167pxaacu0 at pxaip? addr 0x40500000 intr 14 # Wolfson WM97xx
168 168
169# Audio support 169# Audio support
170audio* at audiobus? 170audio* at audiobus?
171 171
172spkr* at audio? # PC speaker (synthesized) 172spkr* at audio? # PC speaker (synthesized)
173 173
174# Inter-Integrated Circuit controller 174# Inter-Integrated Circuit controller
175nbpiic0 at pxaip? addr 0x40300000 intr 18 175nbpiic0 at pxaip? addr 0x40300000 intr 18
176iic* at nbpiic? 176iic* at nbpiic?
177 177
178nbppcon* at iic0 addr 0x13 # PCon 178nbppcon* at iic? addr 0x13 # PCon
179r2025rtc* at iic0 addr 0x32 # R2025S RTC 179r2025rtc* at iic? addr 0x32 # R2025S RTC
180seeprom* at iic0 addr 0x53 size 128 180seeprom* at iic? addr 0x53 size 128
181 181
182nbppm* at nbppcon? tag 0x05 182nbppm* at nbppcon? tag 0x05
183hpcapm* at nbppm? 183hpcapm* at nbppm?
184apmdev0 at hpcapm? 184apmdev0 at hpcapm?
185 185
186nbpkbd* at nbppcon? tag 0x00 186nbpkbd* at nbppcon? tag 0x00
187hpckbd* at nbpkbd? 187hpckbd* at nbpkbd?
188wskbd0 at hpckbd? mux 1 188wskbd0 at hpckbd? mux 1
189 189
190# integrated MMC/SD contoller 190# integrated MMC/SD contoller
191pxamci0 at pxaip? addr 0x41100000 191pxamci0 at pxaip? addr 0x41100000
192sdmmc* at pxamci? 192sdmmc* at pxamci?
193ld* at sdmmc? # MMC/SD/SDHC card 193ld* at sdmmc? # MMC/SD/SDHC card
cvs diff -r1.439 -r1.440 src/sys/arch/i386/conf/ALL (expand / switch to unified diff)

--- src/sys/arch/i386/conf/ALL 2018/05/15 01:53:27 1.439
+++ src/sys/arch/i386/conf/ALL 2018/06/07 13:36:29 1.440
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: ALL,v 1.439 2018/05/15 01:53:27 thorpej Exp $ 1# $NetBSD: ALL,v 1.440 2018/06/07 13:36:29 thorpej Exp $
2# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp 2# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
3# 3#
4# ALL machine description file 4# ALL machine description file
5# 5#
6# This machine description includes all devices and options and it is 6# This machine description includes all devices and options and it is
7# used to compile-test the source and does not necessarily produce a 7# used to compile-test the source and does not necessarily produce a
8# bootable or useful kernel. 8# bootable or useful kernel.
9# 9#
10# For further information on hardware support for this architecture, see 10# For further information on hardware support for this architecture, see
11# the intro(4) man page. For further information about kernel options 11# the intro(4) man page. For further information about kernel options
12# for this architecture, see the options(4) man page. For an explanation 12# for this architecture, see the options(4) man page. For an explanation
13# of each device driver in this file see the section 4 man page for the 13# of each device driver in this file see the section 4 man page for the
14# device. 14# device.
15 15
16include "arch/i386/conf/std.i386" 16include "arch/i386/conf/std.i386"
17 17
18options INCLUDE_CONFIG_FILE # embed config file in kernel binary 18options INCLUDE_CONFIG_FILE # embed config file in kernel binary
19 19
20#ident "ALL-$Revision: 1.439 $" 20#ident "ALL-$Revision: 1.440 $"
21 21
22maxusers 64 # estimated number of users 22maxusers 64 # estimated number of users
23 23
24makeoptions USE_SSP=yes 24makeoptions USE_SSP=yes
25 25
26# CPU-related options. 26# CPU-related options.
27options USER_LDT # user-settable LDT; used by WINE 27options USER_LDT # user-settable LDT; used by WINE
28options X86EMU # 386 Real Mode emulator 28options X86EMU # 386 Real Mode emulator
29options PAE # PAE mode (36 bits physical addressing) 29options PAE # PAE mode (36 bits physical addressing)
30makeoptions SPECTRE_V2_GCC_MITIGATION=1 # GCC Spectre variant 2 30makeoptions SPECTRE_V2_GCC_MITIGATION=1 # GCC Spectre variant 2
31 # migitation 31 # migitation
32 32
33# CPU features 33# CPU features
@@ -702,40 +702,40 @@ iic* at ichsmb? @@ -702,40 +702,40 @@ iic* at ichsmb?
702nfsmbc* at pci? dev ? function ? 702nfsmbc* at pci? dev ? function ?
703nfsmb* at nfsmbc? 703nfsmb* at nfsmbc?
704iic* at nfsmb? 704iic* at nfsmb?
705 705
706# Intel PIIX4 power management controllers 706# Intel PIIX4 power management controllers
707piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller 707piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller
708iic* at piixpm? # SMBus on PIIX4 708iic* at piixpm? # SMBus on PIIX4
709 709
710# I2C controller as found in some Intel PCH devices. 710# I2C controller as found in some Intel PCH devices.
711dwiic* at pci? # I2C controller 711dwiic* at pci? # I2C controller
712iic* at dwiic? 712iic* at dwiic?
713 713
714# dbCool Thermal monitor and fan controller 714# dbCool Thermal monitor and fan controller
715dbcool* at iic0 addr 0x2C # Unknown other motherboard(s) 715dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
716dbcool* at iic0 addr 0x2D # Tyan S2881 716dbcool* at iic? addr 0x2D # Tyan S2881
717dbcool* at iic0 addr 0x2E # Tyan S2882-D 717dbcool* at iic? addr 0x2E # Tyan S2882-D
718 718
719# IBM Hawk Integrated Systems Management Processor 719# IBM Hawk Integrated Systems Management Processor
720ibmhawk0 at iic0 addr 0x37 720ibmhawk0 at iic? addr 0x37
721 721
722# LM7[89] and compatible hardware monitors 722# LM7[89] and compatible hardware monitors
723# Use flags to select temp sensor type (see lm(4) man page for details) 723# Use flags to select temp sensor type (see lm(4) man page for details)
724lm0 at iic0 addr 0x2e flags 0x0 724lm0 at iic? addr 0x2e flags 0x0
725 725
726# SMSC LPC47M192 hardware monitor 726# SMSC LPC47M192 hardware monitor
727smscmon* at iic0 addr 0x2c 727smscmon* at iic? addr 0x2c
728#smscmon* at iic0 addr 0x2d # (alternate address) 728#smscmon* at iic? addr 0x2d # (alternate address)
729 729
730# IBM Thinkpad Active Protection System 730# IBM Thinkpad Active Protection System
731aps0 at isa? port 0x1600 731aps0 at isa? port 0x1600
732 732
733# Fintek Super I/O with hardware monitor 733# Fintek Super I/O with hardware monitor
734finsio0 at isa? port 0x4e 734finsio0 at isa? port 0x4e
735 735
736# iTE IT87xxF Super I/O with watchdog and sensors support 736# iTE IT87xxF Super I/O with watchdog and sensors support
737itesio0 at isa? port 0x2e 737itesio0 at isa? port 0x2e
738 738
739# Winbond LPC Super I/O 739# Winbond LPC Super I/O
740wbsio* at isa? port 0x2e 740wbsio* at isa? port 0x2e
741wbsio* at isa? port 0x4e 741wbsio* at isa? port 0x4e
@@ -748,42 +748,42 @@ lm* at wbsio? @@ -748,42 +748,42 @@ lm* at wbsio?
748smsc0 at isa? port 0x02e 748smsc0 at isa? port 0x02e
749 749
750# PC87366 hardware monitor 750# PC87366 hardware monitor
751nsclpcsio* at isa? 751nsclpcsio* at isa?
752gpio* at nsclpcsio? 752gpio* at nsclpcsio?
753 753
754# Abit uGuru Hardware system monitor 754# Abit uGuru Hardware system monitor
755ug0 at isa? port 0xe0 755ug0 at isa? port 0xe0
756 756
757# VIA VT82C686A/VT8231 Hardware Monitor and Power Management Timer 757# VIA VT82C686A/VT8231 Hardware Monitor and Power Management Timer
758viaenv* at pci? dev ? function ? 758viaenv* at pci? dev ? function ?
759 759
760# Serial Presence Detect capable memory modules and optional temp sensors 760# Serial Presence Detect capable memory modules and optional temp sensors
761spdmem* at iic0 addr 0x50 761spdmem* at iic? addr 0x50
762spdmem* at iic0 addr 0x51 762spdmem* at iic? addr 0x51
763spdmem* at iic0 addr 0x52 763spdmem* at iic? addr 0x52
764spdmem* at iic0 addr 0x53 764spdmem* at iic? addr 0x53
765spdmem* at iic0 addr 0x54 765spdmem* at iic? addr 0x54
766spdmem* at iic0 addr 0x55 766spdmem* at iic? addr 0x55
767spdmem* at iic0 addr 0x56 767spdmem* at iic? addr 0x56
768spdmem* at iic0 addr 0x57 768spdmem* at iic? addr 0x57
769sdtemp* at iic0 addr 0x18 769sdtemp* at iic? addr 0x18
770sdtemp* at iic0 addr 0x19 770sdtemp* at iic? addr 0x19
771sdtemp* at iic0 addr 0x1a 771sdtemp* at iic? addr 0x1a
772sdtemp* at iic0 addr 0x1b 772sdtemp* at iic? addr 0x1b
773sdtemp* at iic0 addr 0x1c 773sdtemp* at iic? addr 0x1c
774sdtemp* at iic0 addr 0x1d 774sdtemp* at iic? addr 0x1d
775sdtemp* at iic0 addr 0x1e 775sdtemp* at iic? addr 0x1e
776sdtemp* at iic0 addr 0x1f 776sdtemp* at iic? addr 0x1f
777 777
778# I2C HID devices 778# I2C HID devices
779ihidev* at iic? 779ihidev* at iic?
780 780
781# I2C Mice 781# I2C Mice
782ims* at ihidev? reportid ? 782ims* at ihidev? reportid ?
783wsmouse* at ims? mux 0 783wsmouse* at ims? mux 0
784 784
785# I2O devices 785# I2O devices
786iop* at pci? dev ? function ? # I/O processor 786iop* at pci? dev ? function ? # I/O processor
787iopsp* at iop? tid ? # SCSI/FC-AL ports 787iopsp* at iop? tid ? # SCSI/FC-AL ports
788ld* at iop? tid ? # block devices 788ld* at iop? tid ? # block devices
789dpti* at iop? tid 0 # DPT/Adaptec control interface 789dpti* at iop? tid 0 # DPT/Adaptec control interface
cvs diff -r1.1179 -r1.1180 src/sys/arch/i386/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/i386/conf/GENERIC 2018/05/22 08:15:26 1.1179
+++ src/sys/arch/i386/conf/GENERIC 2018/06/07 13:36:29 1.1180
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.1179 2018/05/22 08:15:26 maxv Exp $ 1# $NetBSD: GENERIC,v 1.1180 2018/06/07 13:36:29 thorpej Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/i386/conf/std.i386" 21include "arch/i386/conf/std.i386"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.1179 $" 25#ident "GENERIC-$Revision: 1.1180 $"
26 26
27maxusers 64 # estimated number of users 27maxusers 64 # estimated number of users
28 28
29# CPU-related options. 29# CPU-related options.
30options USER_LDT # user-settable LDT; used by WINE 30options USER_LDT # user-settable LDT; used by WINE
31#options PAE # PAE mode (36 bits physical addressing) 31#options PAE # PAE mode (36 bits physical addressing)
32makeoptions SPECTRE_V2_GCC_MITIGATION=1 # GCC Spectre variant 2 32makeoptions SPECTRE_V2_GCC_MITIGATION=1 # GCC Spectre variant 2
33 # migitation 33 # migitation
34options SPECTRE_V2_GCC_MITIGATION 34options SPECTRE_V2_GCC_MITIGATION
35 35
36# CPU features 36# CPU features
37acpicpu* at cpu? # ACPI CPU (including frequency scaling) 37acpicpu* at cpu? # ACPI CPU (including frequency scaling)
38coretemp* at cpu? # Intel on-die thermal sensor 38coretemp* at cpu? # Intel on-die thermal sensor
@@ -651,84 +651,84 @@ iic* at ismt? @@ -651,84 +651,84 @@ iic* at ismt?
651nfsmbc* at pci? dev ? function ? 651nfsmbc* at pci? dev ? function ?
652nfsmb* at nfsmbc? 652nfsmb* at nfsmbc?
653iic* at nfsmb? 653iic* at nfsmb?
654 654
655# Intel PIIX4 power management controllers 655# Intel PIIX4 power management controllers
656piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller 656piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller
657iic* at piixpm? # SMBus on PIIX4 657iic* at piixpm? # SMBus on PIIX4
658 658
659# I2C controller as found in some Intel PCH devices. 659# I2C controller as found in some Intel PCH devices.
660dwiic* at pci? # I2C controller 660dwiic* at pci? # I2C controller
661iic* at dwiic? 661iic* at dwiic?
662 662
663# dbCool Thermal monitor and fan controller 663# dbCool Thermal monitor and fan controller
664#dbcool* at iic0 addr 0x2C # Unknown other motherboard(s) 664#dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
665#dbcool* at iic0 addr 0x2D # Tyan S2881 665#dbcool* at iic? addr 0x2D # Tyan S2881
666#dbcool* at iic0 addr 0x2E # Tyan S2882-D 666#dbcool* at iic? addr 0x2E # Tyan S2882-D
667 667
668# IBM Thinkpad Active Protection System 668# IBM Thinkpad Active Protection System
669#aps0 at isa? port 0x1600 669#aps0 at isa? port 0x1600
670 670
671# Fintek Super I/O with hardware monitor 671# Fintek Super I/O with hardware monitor
672#finsio0 at isa? port 0x4e 672#finsio0 at isa? port 0x4e
673 673
674# iTE IT87xxF Super I/O with watchdog and sensors support 674# iTE IT87xxF Super I/O with watchdog and sensors support
675#itesio0 at isa? port 0x2e 675#itesio0 at isa? port 0x2e
676 676
677# Winbond LPC Super I/O 677# Winbond LPC Super I/O
678#wbsio* at isa? port 0x2e 678#wbsio* at isa? port 0x2e
679#wbsio* at isa? port 0x4e 679#wbsio* at isa? port 0x4e
680 680
681# IBM Hawk Integrated Systems Management Processor 681# IBM Hawk Integrated Systems Management Processor
682#ibmhawk0 at iic0 addr 0x37 682#ibmhawk0 at iic? addr 0x37
683 683
684# LM7[89] and compatible hardware monitors 684# LM7[89] and compatible hardware monitors
685# Use flags to select temp sensor type (see lm(4) man page for details) 685# Use flags to select temp sensor type (see lm(4) man page for details)
686#lm0 at isa? port 0x290 flags 0x0 # other common: 0x280, 0x310 686#lm0 at isa? port 0x290 flags 0x0 # other common: 0x280, 0x310
687#lm* at wbsio? 687#lm* at wbsio?
688 688
689# SMSC LPC47B397 hardware monitor functions 689# SMSC LPC47B397 hardware monitor functions
690#smsc0 at isa? port 0x02e 690#smsc0 at isa? port 0x02e
691 691
692# SMSC LPC47M192 hardware monitor 692# SMSC LPC47M192 hardware monitor
693#smscmon* at iic0 addr 0x2c 693#smscmon* at iic? addr 0x2c
694#smscmon* at iic0 addr 0x2d # (alternate address) 694#smscmon* at iic? addr 0x2d # (alternate address)
695 695
696# PC87366 hardware monitor 696# PC87366 hardware monitor
697nsclpcsio* at isa? 697nsclpcsio* at isa?
698 698
699# Abit uGuru Hardware system monitor 699# Abit uGuru Hardware system monitor
700#ug0 at isa? port 0xe0 700#ug0 at isa? port 0xe0
701 701
702# VIA VT82C686A/VT8231 Hardware Monitor and Power Management Timer 702# VIA VT82C686A/VT8231 Hardware Monitor and Power Management Timer
703#viaenv* at pci? dev ? function ? 703#viaenv* at pci? dev ? function ?
704 704
705# Serial Presence Detect capable memory modules 705# Serial Presence Detect capable memory modules
706#spdmem* at iic0 addr 0x50 706#spdmem* at iic? addr 0x50
707#spdmem* at iic0 addr 0x51 707#spdmem* at iic? addr 0x51
708#spdmem* at iic0 addr 0x52 708#spdmem* at iic? addr 0x52
709#spdmem* at iic0 addr 0x53 709#spdmem* at iic? addr 0x53
710#spdmem* at iic0 addr 0x54 710#spdmem* at iic? addr 0x54
711#spdmem* at iic0 addr 0x55 711#spdmem* at iic? addr 0x55
712#spdmem* at iic0 addr 0x56 712#spdmem* at iic? addr 0x56
713#spdmem* at iic0 addr 0x57 713#spdmem* at iic? addr 0x57
714#sdtemp* at iic0 addr 0x18 714#sdtemp* at iic? addr 0x18
715#sdtemp* at iic0 addr 0x19 715#sdtemp* at iic? addr 0x19
716#sdtemp* at iic0 addr 0x1a 716#sdtemp* at iic? addr 0x1a
717#sdtemp* at iic0 addr 0x1b 717#sdtemp* at iic? addr 0x1b
718#sdtemp* at iic0 addr 0x1c 718#sdtemp* at iic? addr 0x1c
719#sdtemp* at iic0 addr 0x1d 719#sdtemp* at iic? addr 0x1d
720#sdtemp* at iic0 addr 0x1e 720#sdtemp* at iic? addr 0x1e
721#sdtemp* at iic0 addr 0x1f 721#sdtemp* at iic? addr 0x1f
722 722
723# I2C HID devices 723# I2C HID devices
724ihidev* at iic? 724ihidev* at iic?
725 725
726# I2C Mice 726# I2C Mice
727ims* at ihidev? reportid ? 727ims* at ihidev? reportid ?
728wsmouse* at ims? mux 0 728wsmouse* at ims? mux 0
729 729
730# I2O devices 730# I2O devices
731iop* at pci? dev ? function ? # I/O processor 731iop* at pci? dev ? function ? # I/O processor
732iopsp* at iop? tid ? # SCSI/FC-AL ports 732iopsp* at iop? tid ? # SCSI/FC-AL ports
733ld* at iop? tid ? # block devices 733ld* at iop? tid ? # block devices
734dpti* at iop? tid 0 # DPT/Adaptec control interface 734dpti* at iop? tid 0 # DPT/Adaptec control interface
cvs diff -r1.128 -r1.129 src/sys/arch/i386/conf/Attic/XEN3_DOM0 (expand / switch to unified diff)

--- src/sys/arch/i386/conf/Attic/XEN3_DOM0 2018/05/15 01:53:27 1.128
+++ src/sys/arch/i386/conf/Attic/XEN3_DOM0 2018/06/07 13:36:29 1.129
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: XEN3_DOM0,v 1.128 2018/05/15 01:53:27 thorpej Exp $ 1# $NetBSD: XEN3_DOM0,v 1.129 2018/06/07 13:36:29 thorpej Exp $
2# 2#
3# XEN3_0: Xen 3.0 domain0 kernel 3# XEN3_0: Xen 3.0 domain0 kernel
4 4
5include "arch/xen/conf/std.xen" 5include "arch/xen/conf/std.xen"
6 6
7#options MULTIPROCESSOR # (not yet - dom0 stuff is not MP-safe) 7#options MULTIPROCESSOR # (not yet - dom0 stuff is not MP-safe)
8 8
9options INCLUDE_CONFIG_FILE # embed config file in kernel binary 9options INCLUDE_CONFIG_FILE # embed config file in kernel binary
10 10
11#options UVMHIST 11#options UVMHIST
12#options UVMHIST_PRINT 12#options UVMHIST_PRINT
13#options SYSCALL_DEBUG 13#options SYSCALL_DEBUG
14 14
@@ -265,47 +265,47 @@ amdtemp* at amdnb_misc? # AMD CPU Temp @@ -265,47 +265,47 @@ amdtemp* at amdnb_misc? # AMD CPU Temp
265# AMD 768 and 8111 power/ACPI controllers 265# AMD 768 and 8111 power/ACPI controllers
266amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface 266amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface
267 267
268# Intel ICH SMBus controller 268# Intel ICH SMBus controller
269ichsmb* at pci? dev ? function ? 269ichsmb* at pci? dev ? function ?
270iic* at ichsmb? 270iic* at ichsmb?
271 271
272# I2C controller as found in some Intel PCH devices. 272# I2C controller as found in some Intel PCH devices.
273dwiic* at pci? # I2C controller 273dwiic* at pci? # I2C controller
274iic* at dwiic? 274iic* at dwiic?
275 275
276# dbCool thermal monitor and fan controller 276# dbCool thermal monitor and fan controller
277#iic* at amdpm? # sensors below are on this bus 277#iic* at amdpm? # sensors below are on this bus
278#dbcool* at iic0 addr 0x2C # Unknown other motherboard(s) 278#dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
279#dbcool* at iic0 addr 0x2D # Tyan S2881 279#dbcool* at iic? addr 0x2D # Tyan S2881
280#dbcool* at iic0 addr 0x2E # Tyan S2882-D 280#dbcool* at iic? addr 0x2E # Tyan S2882-D
281 281
282# Serial Presence Detect capable memory modules 282# Serial Presence Detect capable memory modules
283#spdmem* at iic0 addr 0x50 283#spdmem* at iic? addr 0x50
284#spdmem* at iic0 addr 0x51 284#spdmem* at iic? addr 0x51
285#spdmem* at iic0 addr 0x52 285#spdmem* at iic? addr 0x52
286#spdmem* at iic0 addr 0x53 286#spdmem* at iic? addr 0x53
287#spdmem* at iic0 addr 0x54 287#spdmem* at iic? addr 0x54
288#spdmem* at iic0 addr 0x55 288#spdmem* at iic? addr 0x55
289#spdmem* at iic0 addr 0x56 289#spdmem* at iic? addr 0x56
290#spdmem* at iic0 addr 0x57 290#spdmem* at iic? addr 0x57
291#sdtemp* at iic0 addr 0x18 291#sdtemp* at iic? addr 0x18
292#sdtemp* at iic0 addr 0x19 292#sdtemp* at iic? addr 0x19
293#sdtemp* at iic0 addr 0x1a 293#sdtemp* at iic? addr 0x1a
294#sdtemp* at iic0 addr 0x1b 294#sdtemp* at iic? addr 0x1b
295#sdtemp* at iic0 addr 0x1c 295#sdtemp* at iic? addr 0x1c
296#sdtemp* at iic0 addr 0x1d 296#sdtemp* at iic? addr 0x1d
297#sdtemp* at iic0 addr 0x1e 297#sdtemp* at iic? addr 0x1e
298#sdtemp* at iic0 addr 0x1f 298#sdtemp* at iic? addr 0x1f
299 299
300# Winbond LPC Super I/O 300# Winbond LPC Super I/O
301#wbsio* at isa? port 0x2e 301#wbsio* at isa? port 0x2e
302#wbsio* at isa? port 0x4e 302#wbsio* at isa? port 0x4e
303 303
304# LM7[89] and compatible hardware monitors 304# LM7[89] and compatible hardware monitors
305# Use flags to select temp sensor type (see lm(4) man page for details) 305# Use flags to select temp sensor type (see lm(4) man page for details)
306#lm0 at isa? port 0x290 flags 0x0 # other common: 0x280, 0x310, 0xc00 306#lm0 at isa? port 0x290 flags 0x0 # other common: 0x280, 0x310, 0xc00
307#lm* at wbsio? 307#lm* at wbsio?
308 308
309# VIA VT82C686A/VT8231 Hardware Monitor and Power Management TImer 309# VIA VT82C686A/VT8231 Hardware Monitor and Power Management TImer
310#viaenv* at pci? dev ? function ? 310#viaenv* at pci? dev ? function ?
311 311
cvs diff -r1.24 -r1.25 src/sys/arch/mmeye/conf/MMEYE_WLF (expand / switch to unified diff)

--- src/sys/arch/mmeye/conf/MMEYE_WLF 2018/05/14 22:01:57 1.24
+++ src/sys/arch/mmeye/conf/MMEYE_WLF 2018/06/07 13:36:29 1.25
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: MMEYE_WLF,v 1.24 2018/05/14 22:01:57 thorpej Exp $ 1# $NetBSD: MMEYE_WLF,v 1.25 2018/06/07 13:36:29 thorpej Exp $
2# 2#
3# MMEYE_WLF -- Brains Inc. MMEYE-WLF platforms kernel 3# MMEYE_WLF -- Brains Inc. MMEYE-WLF platforms kernel
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/mmeye/conf/std.mmeye" 21include "arch/mmeye/conf/std.mmeye"
22 22
23#options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.24 $" 25#ident "GENERIC-$Revision: 1.25 $"
26 26
27maxusers 16 # estimated number of users 27maxusers 16 # estimated number of users
28 28
29# CPU support 29# CPU support
30options SH4 30options SH4
31options SH7750R 31options SH7750R
32options MMEYE 32options MMEYE
33options MMEYE_NEW_INT=0xb2000000 33options MMEYE_NEW_INT=0xb2000000
34options MMEYE_EPC_WDT 34options MMEYE_EPC_WDT
35options PCLOCK=60000000 # 60.00MHz 35options PCLOCK=60000000 # 60.00MHz
36 36
37options IOM_RAM_SIZE=0x04000000 # 64MB 37options IOM_RAM_SIZE=0x04000000 # 64MB
38options IOM_RAM_BEGIN=0x08000000 # Area2 38options IOM_RAM_BEGIN=0x08000000 # Area2
@@ -149,27 +149,27 @@ config netbsd root on ? type ? @@ -149,27 +149,27 @@ config netbsd root on ? type ?
149# 149#
150 150
151mainbus0 at root 151mainbus0 at root
152 152
153cpu* at mainbus? 153cpu* at mainbus?
154shb* at mainbus? 154shb* at mainbus?
155options SCIFCONSOLE 155options SCIFCONSOLE
156options SCIFCN_SPEED=19200 156options SCIFCN_SPEED=19200
157scif0 at shb? 157scif0 at shb?
158sci0 at shb? 158sci0 at shb?
159 159
160rtciic0 at mainbus? addr1 0xb100000e 160rtciic0 at mainbus? addr1 0xb100000e
161iic* at rtciic? 161iic* at rtciic?
162rs5c372rtc* at iic0 addr 0x32 162rs5c372rtc* at iic? addr 0x32
163 163
164#ac97x at mainbus? addr1 0xb3000000-0xb300000f irq1 1 # AD1881A 164#ac97x at mainbus? addr1 0xb3000000-0xb300000f irq1 1 # AD1881A
165audio* at audiobus? 165audio* at audiobus?
166 166
167spkr* at audio? # PC speaker (synthesized) 167spkr* at audio? # PC speaker (synthesized)
168 168
169# SH4 Area5/6 PCMCIA space devices 169# SH4 Area5/6 PCMCIA space devices
170ne0 at mainbus? addr1 0x14000000 irq1 13 170ne0 at mainbus? addr1 0x14000000 irq1 13
171com0 at mainbus? addr1 0x15000000 irq1 5 171com0 at mainbus? addr1 0x15000000 irq1 5
172com1 at mainbus? addr1 0x15000008 irq1 4 172com1 at mainbus? addr1 0x15000008 irq1 4
173wdc0 at mainbus? addr1 0x16000000 irq1 12 173wdc0 at mainbus? addr1 0x16000000 irq1 12
174wdc1 at mainbus? addr1 0x17000000 irq1 14 174wdc1 at mainbus? addr1 0x17000000 irq1 14
175 175
cvs diff -r1.76 -r1.77 src/sys/arch/zaurus/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/zaurus/conf/GENERIC 2018/05/15 00:44:56 1.76
+++ src/sys/arch/zaurus/conf/GENERIC 2018/06/07 13:36:29 1.77
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: GENERIC,v 1.76 2018/05/15 00:44:56 thorpej Exp $ 1# $NetBSD: GENERIC,v 1.77 2018/06/07 13:36:29 thorpej Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
@@ -182,53 +182,53 @@ options PXA2X0_DMAC_DMOVER_CONCURRENCY= @@ -182,53 +182,53 @@ options PXA2X0_DMAC_DMOVER_CONCURRENCY=
182# I2C support 182# I2C support
183ziic0 at pxaip? 183ziic0 at pxaip?
184iic0 at ziic? 184iic0 at ziic?
185 185
186# Power management 186# Power management
187zapm0 at pxaip? # power management 187zapm0 at pxaip? # power management
188apmdev0 at zapm0 # APM 188apmdev0 at zapm0 # APM
189 189
190# PCMCIA/CF socket and GPIO controllers 190# PCMCIA/CF socket and GPIO controllers
191scoop0 at pxaip? 191scoop0 at pxaip?
192scoop1 at pxaip? 192scoop1 at pxaip?
193 193
194# alternate GPIO contoller for SL-C1000 194# alternate GPIO contoller for SL-C1000
195ioexp0 at iic0 addr 0x18 195ioexp0 at iic? addr 0x18
196 196
197# ADC, touchpad, backlight 197# ADC, touchpad, backlight
198zssp0 at pxaip? 198zssp0 at pxaip?
199 199
200# touchpad 200# touchpad
201ztp0 at zssp? 201ztp0 at zssp?
202wsmouse* at ztp? mux 0 202wsmouse* at ztp? mux 0
203 203
204# keyboard 204# keyboard
205zkbd0 at pxaip? 205zkbd0 at pxaip?
206wskbd* at zkbd? mux 1 206wskbd* at zkbd? mux 1
207 207
208# remote controller 208# remote controller
209zrc0 at pxaip? 209zrc0 at pxaip?
210wskbd* at zrc? mux 1 210wskbd* at zrc? mux 1
211 211
212# LCD 212# LCD
213lcd0 at pxaip? # PXA2x0 integrated LCD Controller 213lcd0 at pxaip? # PXA2x0 integrated LCD Controller
214options PXA2X0_LCD_WRITETHROUGH 214options PXA2X0_LCD_WRITETHROUGH
215wsdisplay* at lcd? console ? 215wsdisplay* at lcd? console ?
216w100lcd0 at pxaip? # ATI Imageon100 LCDcontroller 216w100lcd0 at pxaip? # ATI Imageon100 LCDcontroller
217wsdisplay* at w100lcd? console ? 217wsdisplay* at w100lcd? console ?
218lcdctl0 at zssp0 218lcdctl0 at zssp0
219 219
220# WM8750 Audio 220# WM8750 Audio
221zaudio0 at iic0 addr 0x1b 221zaudio0 at iic? addr 0x1b
222audio* at zaudio? 222audio* at zaudio?
223#options ZAUDIO_VOLUME_STRIDE=8 223#options ZAUDIO_VOLUME_STRIDE=8
224 224
225# Audio support 225# Audio support
226audio* at audiobus? 226audio* at audiobus?
227 227
228spkr* at audio? # PC speaker (synthesized) 228spkr* at audio? # PC speaker (synthesized)
229 229
230# integrated 16550 UARTs 230# integrated 16550 UARTs
231options COM_PXA2X0 231options COM_PXA2X0
232#options FFUARTCONSOLE 232#options FFUARTCONSOLE
233com0 at pxaip? addr 0x40100000 intr 22 # Full Function UART 233com0 at pxaip? addr 0x40100000 intr 22 # Full Function UART
234com1 at pxaip? addr 0x40200000 intr 21 # Bluetooth UART 234com1 at pxaip? addr 0x40200000 intr 21 # Bluetooth UART
cvs diff -r1.36 -r1.37 src/sys/arch/zaurus/conf/INSTALL (expand / switch to unified diff)

--- src/sys/arch/zaurus/conf/INSTALL 2018/05/15 00:44:56 1.36
+++ src/sys/arch/zaurus/conf/INSTALL 2018/06/07 13:36:29 1.37
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: INSTALL,v 1.36 2018/05/15 00:44:56 thorpej Exp $ 1# $NetBSD: INSTALL,v 1.37 2018/06/07 13:36:29 thorpej Exp $
2# 2#
3# INSTALL config file (GENERIC with memory disk root) 3# INSTALL config file (GENERIC with memory disk root)
4# 4#
5 5
6include "arch/zaurus/conf/GENERIC" 6include "arch/zaurus/conf/GENERIC"
7 7
8# Enable the hooks used for initializing the root memory-disk. 8# Enable the hooks used for initializing the root memory-disk.
9options MEMORY_DISK_HOOKS # enable root ramdisk 9options MEMORY_DISK_HOOKS # enable root ramdisk
10options MEMORY_DISK_IS_ROOT # force root on memory disk 10options MEMORY_DISK_IS_ROOT # force root on memory disk
11options MEMORY_DISK_SERVER=0 # no userspace memory disk support 11options MEMORY_DISK_SERVER=0 # no userspace memory disk support
12options MEMORY_DISK_ROOT_SIZE=4096 # size of memory disk, in blocks 12options MEMORY_DISK_ROOT_SIZE=4096 # size of memory disk, in blocks
13options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode 13options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
14 14
@@ -58,27 +58,27 @@ options RASOPS_SMALL @@ -58,27 +58,27 @@ options RASOPS_SMALL
58 58
59no options DIAGNOSTIC 59no options DIAGNOSTIC
60no options DDB 60no options DDB
61no options DDB_HISTORY_SIZE 61no options DDB_HISTORY_SIZE
62no makeoptions COPY_SYMTAB 62no makeoptions COPY_SYMTAB
63 63
64no options PXA2X0_DMAC_DMOVER_CONCURRENCY 64no options PXA2X0_DMAC_DMOVER_CONCURRENCY
65 65
66no zrc0 at pxaip? 66no zrc0 at pxaip?
67 67
68no ztp0 at zssp? 68no ztp0 at zssp?
69no wsmouse* at ztp? 69no wsmouse* at ztp?
70 70
71no zaudio0 at iic0 71no zaudio0 at iic?
72no audio* at zaudio? 72no audio* at zaudio?
73no spkr* at audio? 73no spkr* at audio?
74 74
75no ums* at uhidev? 75no ums* at uhidev?
76no wsmouse* at ums? 76no wsmouse* at ums?
77no ugen* 77no ugen*
78 78
79no uk* at scsibus? 79no uk* at scsibus?
80 80
81no acphy* 81no acphy*
82no amhphy* 82no amhphy*
83no bmtphy* 83no bmtphy*
84no glxtphy* 84no glxtphy*
cvs diff -r1.3 -r1.4 src/sys/arch/zaurus/conf/INSTALL_C700 (expand / switch to unified diff)

--- src/sys/arch/zaurus/conf/INSTALL_C700 2018/05/15 00:44:56 1.3
+++ src/sys/arch/zaurus/conf/INSTALL_C700 2018/06/07 13:36:29 1.4
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: INSTALL_C700,v 1.3 2018/05/15 00:44:56 thorpej Exp $ 1# $NetBSD: INSTALL_C700,v 1.4 2018/06/07 13:36:29 thorpej Exp $
2# 2#
3# INSTALL config file (C700 with memory disk root) 3# INSTALL config file (C700 with memory disk root)
4# 4#
5# Note: C700 seems to have more size restriction. 5# Note: C700 seems to have more size restriction.
6# 6#
7 7
8include "arch/zaurus/conf/INSTALL" 8include "arch/zaurus/conf/INSTALL"
9 9
10no options CPU_XSCALE_PXA270 10no options CPU_XSCALE_PXA270
11 11
12no makeoptions KERNEL_BASE_PHYS 12no makeoptions KERNEL_BASE_PHYS
13makeoptions KERNEL_BASE_PHYS="0xa0400000" 13makeoptions KERNEL_BASE_PHYS="0xa0400000"
14no makeoptions LOADADDRESS 14no makeoptions LOADADDRESS
15makeoptions LOADADDRESS="0xc0400000" 15makeoptions LOADADDRESS="0xc0400000"
16 16
17no scoop1 at pxaip? 17no scoop1 at pxaip?
18no ioexp0 at iic0 18no ioexp0 at iic?
19 19
20no lcd0 at pxaip? 20no lcd0 at pxaip?
21no wsdisplay* at lcd? 21no wsdisplay* at lcd?
22 22
23no zusb* 23no zusb*
24no ohci0 24no ohci0
25no usb* 25no usb*
26no uhub*  26no uhub*
27 27
28no uhidev* 28no uhidev*
29no ukbd* 29no ukbd*
30no wskbd* at ukbd? 30no wskbd* at ukbd?
31no uhid* 31no uhid*