Wed Mar 10 06:38:44 2021 UTC ()
 Add micphy(4).


(msaitoh)
diff -r1.586 -r1.587 src/sys/arch/amd64/conf/GENERIC
diff -r1.1235 -r1.1236 src/sys/arch/i386/conf/GENERIC
cvs diff -r1.586 -r1.587 src/sys/arch/amd64/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/amd64/conf/GENERIC 2021/03/05 20:18:39 1.586
+++ src/sys/arch/amd64/conf/GENERIC 2021/03/10 06:38:44 1.587
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.586 2021/03/05 20:18:39 gdt Exp $ 1# $NetBSD: GENERIC,v 1.587 2021/03/10 06:38:44 msaitoh 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.586 $" 25#ident "GENERIC-$Revision: 1.587 $"
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
@@ -901,26 +901,27 @@ exphy* at mii? phy ? # 3Com internal P @@ -901,26 +901,27 @@ exphy* at mii? phy ? # 3Com internal P
901gentbi* at mii? phy ? # Generic Ten-Bit 1000BASE-[CLS]X PHYs 901gentbi* at mii? phy ? # Generic Ten-Bit 1000BASE-[CLS]X PHYs
902glxtphy* at mii? phy ? # Level One LXT-1000 PHYs 902glxtphy* at mii? phy ? # Level One LXT-1000 PHYs
903gphyter* at mii? phy ? # NS83861 Gig-E PHY 903gphyter* at mii? phy ? # NS83861 Gig-E PHY
904icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x 904icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
905igphy* at mii? phy ? # Intel IGP01E1000 905igphy* at mii? phy ? # Intel IGP01E1000
906ihphy* at mii? phy ? # Intel 82577 PHYs 906ihphy* at mii? phy ? # Intel 82577 PHYs
907ikphy* at mii? phy ? # Intel 82563 PHYs 907ikphy* at mii? phy ? # Intel 82563 PHYs
908inphy* at mii? phy ? # Intel 82555 PHYs 908inphy* at mii? phy ? # Intel 82555 PHYs
909iophy* at mii? phy ? # Intel 82553 PHYs 909iophy* at mii? phy ? # Intel 82553 PHYs
910ipgphy* at mii? phy ? # IC PLUS IP1000A/IP1001 PHYs 910ipgphy* at mii? phy ? # IC PLUS IP1000A/IP1001 PHYs
911jmphy* at mii? phy ? # Jmicron JMP202/211 PHYs 911jmphy* at mii? phy ? # Jmicron JMP202/211 PHYs
912lxtphy* at mii? phy ? # Level One LXT-970 PHYs 912lxtphy* at mii? phy ? # Level One LXT-970 PHYs
913makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs 913makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs
 914micphy* at mii? phy ? # Micrel KSZ[89]xxx PHYs
914nsphy* at mii? phy ? # NS83840 PHYs 915nsphy* at mii? phy ? # NS83840 PHYs
915nsphyter* at mii? phy ? # NS83843 PHYs 916nsphyter* at mii? phy ? # NS83843 PHYs
916pnaphy* at mii? phy ? # generic HomePNA PHYs 917pnaphy* at mii? phy ? # generic HomePNA PHYs
917qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs 918qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
918rgephy* at mii? phy ? # Realtek 8169S/8110 internal PHYs 919rgephy* at mii? phy ? # Realtek 8169S/8110 internal PHYs
919rlphy* at mii? phy ? # Realtek 8139/8201L PHYs 920rlphy* at mii? phy ? # Realtek 8139/8201L PHYs
920smscphy* at mii? phy ? # SMSC LAN87xx PHYs 921smscphy* at mii? phy ? # SMSC LAN87xx PHYs
921sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs 922sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
922tlphy* at mii? phy ? # ThunderLAN PHYs 923tlphy* at mii? phy ? # ThunderLAN PHYs
923tqphy* at mii? phy ? # TDK Semiconductor PHYs 924tqphy* at mii? phy ? # TDK Semiconductor PHYs
924ukphy* at mii? phy ? # generic unknown PHYs 925ukphy* at mii? phy ? # generic unknown PHYs
925urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs 926urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs
926 927
cvs diff -r1.1235 -r1.1236 src/sys/arch/i386/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/i386/conf/GENERIC 2021/03/01 18:12:58 1.1235
+++ src/sys/arch/i386/conf/GENERIC 2021/03/10 06:38:44 1.1236
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.1235 2021/03/01 18:12:58 jakllsch Exp $ 1# $NetBSD: GENERIC,v 1.1236 2021/03/10 06:38:44 msaitoh 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.1235 $" 25#ident "GENERIC-$Revision: 1.1236 $"
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
@@ -1116,26 +1116,27 @@ exphy* at mii? phy ? # 3Com internal P @@ -1116,26 +1116,27 @@ exphy* at mii? phy ? # 3Com internal P
1116gentbi* at mii? phy ? # Generic Ten-Bit 1000BASE-[CLS]X PHYs 1116gentbi* at mii? phy ? # Generic Ten-Bit 1000BASE-[CLS]X PHYs
1117glxtphy* at mii? phy ? # Level One LXT-1000 PHYs 1117glxtphy* at mii? phy ? # Level One LXT-1000 PHYs
1118gphyter* at mii? phy ? # NS83861 Gig-E PHY 1118gphyter* at mii? phy ? # NS83861 Gig-E PHY
1119icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x 1119icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
1120igphy* at mii? phy ? # Intel IGP01E1000 1120igphy* at mii? phy ? # Intel IGP01E1000
1121ihphy* at mii? phy ? # Intel 82577 PHYs 1121ihphy* at mii? phy ? # Intel 82577 PHYs
1122ikphy* at mii? phy ? # Intel 82563 PHYs 1122ikphy* at mii? phy ? # Intel 82563 PHYs
1123inphy* at mii? phy ? # Intel 82555 PHYs 1123inphy* at mii? phy ? # Intel 82555 PHYs
1124iophy* at mii? phy ? # Intel 82553 PHYs 1124iophy* at mii? phy ? # Intel 82553 PHYs
1125ipgphy* at mii? phy ? # IC PLUS IP1000A/IP1001 PHYs 1125ipgphy* at mii? phy ? # IC PLUS IP1000A/IP1001 PHYs
1126jmphy* at mii? phy ? # Jmicron JMP202/211 PHYs 1126jmphy* at mii? phy ? # Jmicron JMP202/211 PHYs
1127lxtphy* at mii? phy ? # Level One LXT-970 PHYs 1127lxtphy* at mii? phy ? # Level One LXT-970 PHYs
1128makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs 1128makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs
 1129micphy* at mii? phy ? # Micrel KSZ[89]xxx PHYs
1129nsphy* at mii? phy ? # NS83840 PHYs 1130nsphy* at mii? phy ? # NS83840 PHYs
1130nsphyter* at mii? phy ? # NS83843 PHYs 1131nsphyter* at mii? phy ? # NS83843 PHYs
1131pnaphy* at mii? phy ? # generic HomePNA PHYs 1132pnaphy* at mii? phy ? # generic HomePNA PHYs
1132qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs 1133qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
1133rdcphy* at mii? phy ? # RDC R6040 10/100 PHY 1134rdcphy* at mii? phy ? # RDC R6040 10/100 PHY
1134rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs 1135rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs
1135rlphy* at mii? phy ? # Realtek 8139/8201L PHYs 1136rlphy* at mii? phy ? # Realtek 8139/8201L PHYs
1136smscphy* at mii? phy ? # SMSC LAN87xx PHYs 1137smscphy* at mii? phy ? # SMSC LAN87xx PHYs
1137sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs 1138sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
1138tlphy* at mii? phy ? # ThunderLAN PHYs 1139tlphy* at mii? phy ? # ThunderLAN PHYs
1139tqphy* at mii? phy ? # TDK Semiconductor PHYs 1140tqphy* at mii? phy ? # TDK Semiconductor PHYs
1140ukphy* at mii? phy ? # generic unknown PHYs 1141ukphy* at mii? phy ? # generic unknown PHYs
1141urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs 1142urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs