Wed Jun 24 03:38:55 2020 UTC ()
Add amdccp at pci.


(thorpej)
diff -r1.153 -r1.154 src/sys/arch/amd64/conf/ALL
diff -r1.570 -r1.571 src/sys/arch/amd64/conf/GENERIC
cvs diff -r1.153 -r1.154 src/sys/arch/amd64/conf/ALL (expand / switch to unified diff)

--- src/sys/arch/amd64/conf/ALL 2020/06/07 09:45:19 1.153
+++ src/sys/arch/amd64/conf/ALL 2020/06/24 03:38:54 1.154
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: ALL,v 1.153 2020/06/07 09:45:19 maxv Exp $ 1# $NetBSD: ALL,v 1.154 2020/06/24 03:38:54 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.153 $" 20#ident "ALL-$Revision: 1.154 $"
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
@@ -1529,26 +1529,27 @@ wskbd* at btkbd? console ? mux 1 @@ -1529,26 +1529,27 @@ wskbd* at btkbd? console ? mux 1
1529# Bluetooth Apple Magic Mouse 1529# Bluetooth Apple Magic Mouse
1530btmagic* at bthub? 1530btmagic* at bthub?
1531wsmouse* at btmagic? mux 0 1531wsmouse* at btmagic? mux 0
1532 1532
1533# Bluetooth Audio support 1533# Bluetooth Audio support
1534btsco* at bthub? 1534btsco* at bthub?
1535 1535
1536 1536
1537# Mice 1537# Mice
1538 1538
1539# Cryptographic Devices 1539# Cryptographic Devices
1540 1540
1541# PCI cryptographic devices 1541# PCI cryptographic devices
 1542amdccp* at pci? dev ? function ? # AMD Cryptographic Coprocessor
1542hifn* at pci? dev ? function ? # Hifn 7755/7811/795x 1543hifn* at pci? dev ? function ? # Hifn 7755/7811/795x
1543qat* at pci? dev ? function ? # Intel QuickAssist 1544qat* at pci? dev ? function ? # Intel QuickAssist
1544ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x 1545ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x
1545 1546
1546# Trusted Platform Module 1547# Trusted Platform Module
1547tpm* at isa? iomem 0xfed40000 irq 7 1548tpm* at isa? iomem 0xfed40000 irq 7
1548 1549
1549# Joysticks 1550# Joysticks
1550 1551
1551# PCI joysticks 1552# PCI joysticks
1552joy* at pci? # Game ports (usually on audio cards) 1553joy* at pci? # Game ports (usually on audio cards)
1553joy* at eap? # See CAVEATS in eap(4) before enabling 1554joy* at eap? # See CAVEATS in eap(4) before enabling
1554joy* at eso? # ESS Solo-1 on-board joystick 1555joy* at eso? # ESS Solo-1 on-board joystick
cvs diff -r1.570 -r1.571 src/sys/arch/amd64/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/amd64/conf/GENERIC 2020/06/18 16:23:43 1.570
+++ src/sys/arch/amd64/conf/GENERIC 2020/06/24 03:38:54 1.571
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.570 2020/06/18 16:23:43 maxv Exp $ 1# $NetBSD: GENERIC,v 1.571 2020/06/24 03:38:54 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.570 $" 25#ident "GENERIC-$Revision: 1.571 $"
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
@@ -451,26 +451,27 @@ radeondrmkmsfb* at radeonfbbus? @@ -451,26 +451,27 @@ radeondrmkmsfb* at radeonfbbus?
451 451
452#amdgpu* at pci? dev ? function ? 452#amdgpu* at pci? dev ? function ?
453#amdgpufb* at amdgpufbbus? 453#amdgpufb* at amdgpufbbus?
454 454
455nouveau* at pci? dev ? function ? 455nouveau* at pci? dev ? function ?
456nouveaufb* at nouveaufbbus? 456nouveaufb* at nouveaufbbus?
457 457
458# DRMUMS drivers 458# DRMUMS drivers
459#viadrmums* at drm? 459#viadrmums* at drm?
460 460
461# Cryptographic Devices 461# Cryptographic Devices
462 462
463# PCI cryptographic devices 463# PCI cryptographic devices
 464amdccp* at pci? dev ? function ? # AMD Cryptographic Coprocessor
464hifn* at pci? dev ? function ? # Hifn 7755/7811/795x 465hifn* at pci? dev ? function ? # Hifn 7755/7811/795x
465#qat* at pci? dev ? function ? # Intel QuickAssist 466#qat* at pci? dev ? function ? # Intel QuickAssist
466ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x 467ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x
467 468
468# Trusted Platform Module 469# Trusted Platform Module
469tpm* at isa? iomem 0xfed40000 irq 7 470tpm* at isa? iomem 0xfed40000 irq 7
470 471
471# Serial Devices 472# Serial Devices
472 473
473# PCI serial interfaces 474# PCI serial interfaces
474com* at puc? port ? # 16x50s on "universal" comm boards 475com* at puc? port ? # 16x50s on "universal" comm boards
475cy* at pci? dev ? function ? # Cyclades Cyclom-Y serial boards 476cy* at pci? dev ? function ? # Cyclades Cyclom-Y serial boards
476cz* at pci? dev ? function ? # Cyclades-Z multi-port serial boards 477cz* at pci? dev ? function ? # Cyclades-Z multi-port serial boards