Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/arch/i386/conf/ALL,v rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/i386/conf/ALL,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.440 retrieving revision 1.440.2.1 diff -u -p -r1.440 -r1.440.2.1 --- src/sys/arch/i386/conf/ALL 2018/06/07 13:36:29 1.440 +++ src/sys/arch/i386/conf/ALL 2019/06/10 22:06:20 1.440.2.1 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.440 2018/06/07 13:36:29 thorpej Exp $ +# $NetBSD: ALL,v 1.440.2.1 2019/06/10 22:06:20 christos Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.440 $" +#ident "ALL-$Revision: 1.440.2.1 $" maxusers 64 # estimated number of users @@ -41,7 +41,6 @@ viac7temp* at cpu? # VIA C7 temperature vmt0 at cpu0 # VMware Tools options MTRR # memory-type range register syscall support -options PMC # performance-monitoring counters support options MULTIBOOT # Multiboot support (see multiboot(8)) @@ -119,6 +118,7 @@ options DDB_VERBOSE_HELP options KGDB # remote debugger options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 makeoptions DEBUG="-g" # compile full symbol table +options KUBSAN # Kernel Undefined Behavior Sanitizer (kUBSan) options SYSCALL_STATS # per syscall counts options SYSCALL_TIMES # per syscall times options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris) @@ -126,6 +126,10 @@ options KDTRACE_HOOKS # kernel DTrace h options UVMHIST # kernhist for uvm subsystem options BIOHIST # kernhist for buff I/O +# Kernel Code Coverage Driver. +makeoptions KCOV=1 +options KCOV + # Compatibility options include "conf/compat_netbsd09.config" options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI @@ -134,7 +138,6 @@ options COMPAT_386BSD_MBRPART # recogni options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility options COMPAT_LINUX # binary compatibility with Linux options COMPAT_FREEBSD # binary compatibility with FreeBSD -options COMPAT_NDIS # NDIS network driver # Wedge support options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances @@ -319,7 +322,6 @@ p64h2apic* at pci? dev? function? # P64H #options APM_V10_ONLY # Use only the APM 1.0 calls #options APM_NO_POWEROFF # Don't power off on halt(8) #options APM_POWER_PRINT # Print stats on the console -#options APM_DISABLE_INTERRUPTS=0 # Don't disable interrupts # Basic Bus Support @@ -595,7 +597,6 @@ wsdisplay* at wsemuldisplaydev? #sisdrm* at drm? # SiS DRM driver #tdfxdrm* at drm? # 3dfx (voodoo) DRM driver #vboxdrm* at drm? # VirtualBox DRM driver -#viadrm* at drm? # VIA UniChrome DRM driver # DRMKMS drivers i915drmkms* at pci? dev ? function ? @@ -604,6 +605,9 @@ intelfb* at intelfbbus? radeon* at pci? dev ? function ? radeondrmkmsfb* at radeonfbbus? +amdgpu* at pci? dev ? function ? +amdgpufb* at amdgpufbbus? + nouveau* at pci? dev ? function ? nouveaufb* at nouveaufbbus? @@ -826,6 +830,7 @@ dpt* at pci? dev ? function ? # DPT Smar iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel mfi* at pci? dev ? function ? # LSI MegaRAID SAS +mfii* at pci? dev ? function ? # LSI MegaRAID SAS (Fusion and newer) mly* at pci? dev ? function ? # Mylex AcceleRAID and eXtremeRAID mpt* at pci? dev ? function ? # LSILogic 9x9 and 53c1030 (Fusion-MPT) mpii* at pci? dev ? function ? # LSI Logic Fusion-MPT II @@ -1045,7 +1050,6 @@ bnx* at pci? dev ? function ? # Broadcom bwi* at pci? dev ? function ? # Broadcom BCM43xx wireless cas* at pci? dev ? function ? # Sun Cassini/Cassini+ Ethernet dge* at pci? dev ? function ? # Intel 82597 10GbE LR -en* at pci? dev ? function ? # ENI/Adaptec ATM ep* at pci? dev ? function ? # 3Com 3c59x epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet esh* at pci? dev ? function ? # Essential HIPPI card @@ -1064,12 +1068,10 @@ ixg* at pci? dev ? function ? # Intel 82 jme* at pci? dev ? function ? # JMicron JMC2[56]0 Ethernet le* at pci? dev ? function ? # PCnet-PCI Ethernet lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet -lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3 malo* at pci? dev ? function ? # Marvell Libertas Wireless mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet -#ndis* at pci? dev ? function ? # Experimental - NDIS Network Driver ne* at pci? dev ? function ? # NE2000-compatible Ethernet nfe* at pci? dev ? function ? # NVIDIA nForce Ethernet ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial @@ -1168,6 +1170,7 @@ atw* at cardbus? function ? # ADMtek ADM bwi* at cardbus? function ? # Broadcom BCM43xx wireless ex* at cardbus? function ? # 3Com 3c575TX fxp* at cardbus? function ? # Intel i8255x +malo* at cardbus? function ? # Marvell Libertas Wireless ral* at cardbus? function ? # Ralink Technology RT25x0 802.11a/b/g re* at cardbus? function ? # Realtek 8139C+/8169/8169S/8110S rtk* at cardbus? function ? # Realtek 8129/8139 @@ -1336,7 +1339,10 @@ axen* at uhub? port ? # ASIX AX88178a/A cdce* at uhub? port ? # CDC, Ethernet Networking Control Model cue* at uhub? port ? # CATC USB-EL1201A based adapters kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters +mue* at uhub? port ? # Microchip LAN75xx/LAN78xx based adapters udav* at uhub? port ? # Davicom DM9601 based adapters +umb* at uhub? port ? # Mobile Broadband Interface Model (EXPERIMENTAL) +ure* at uhub? port ? # Realtek RTL8152/RTL8153 based adapters url* at uhub? port ? # Realtek RTL8150L based adapters urndis* at uhub? port ? # Microsoft RNDIS specification @@ -1386,9 +1392,6 @@ ucom* at uvscom? portno ? uark* at uhub? port ? ucom* at uark? portno ? -moscom* at uhub? port ? -ucom* at moscom? portno ? - umcs* at uhub? port ? # Moschip MCS7xxx serial adapter ucom* at umcs? portno ? @@ -1689,9 +1692,6 @@ geodegcb* at pci? dev ? function ? # Ge geodewdog* at geodegcb? # AMD Geode SC1100 watchdog timer geodecntr* at geodegcb? # AMD Geode SC1100 high res. counter -# Planetconnect Satellite receiver driver. -satlink0 at isa? port 0x300 drq 1 - # Middle Digital, Inc. PCI-Weasel serial console board control # devices (watchdog timer, etc.) weasel* at pci? @@ -1770,7 +1770,7 @@ pseudo-device pflog # PF log if pseudo-device pfsync # PF sync if #pseudo-device npf # NPF packet filter pseudo-device kttcp -pseudo-device etherip # EtherIP +pseudo-device l2tp # L2TPv3 interface # srt is EXPERIMENTAL pseudo-device srt # source-address-based routing @@ -1831,112 +1831,13 @@ pseudo-device dmoverio pseudo-device nandemulator -options FILEASSOC # fileassoc(9) - required for Veriexec - # and PAX_SEGVGUARD - # Veriexec -pseudo-device veriexec -# -# Uncomment the fingerprint methods below that are desired. Note that -# removing fingerprint methods will have almost no impact on the kernel -# code size. -# -options VERIFIED_EXEC_FP_SHA256 -options VERIFIED_EXEC_FP_SHA384 -options VERIFIED_EXEC_FP_SHA512 +include "dev/veriexec.config" options PAX_MPROTECT=0 # PaX mprotect(2) restrictions options PAX_ASLR=0 # PaX Address Space Layout Randomization #options PAX_SEGVGUARD=0 # PaX Segmentation fault guard -# -# NetBSD: GENERIC_ISDN,v 1.16 2010/01/03 03:53:34 dholland Exp -# - -#--------------------------------------------------------------------- -# Various ISDN board drivers: -#--------------------------------------------------------------------- -# Legacy ISA cards (no P&P support): -# -# Teles S0/8 or Niccy 1008 -options ISICISA_TEL_S0_8 -#isic0 at isa? iomem 0xd0000 irq 2 -# Teles S0/16 or Creatix ISDN-S0 or Niccy 1016 -options ISICISA_TEL_S0_16 -#isic0 at isa? port 0xd80 iomem 0xd0000 irq 9 -# Teles S0/16.3 -options ISICISA_TEL_S0_16_3 -#isic0 at isa? port 0xd80 irq 12 -# AVM A1 or AVM Fritz!Card -options ISICISA_AVM_A1 -isic0 at isa? port 0x340 irq 10 -# USRobotics Sportster ISDN TA intern -options ISICISA_USR_STI -#isic0 at isa? port 0x268 irq 10 -# ITK ix1 micro -options ISICISA_ITKIX1 -#isic0 at isa? port 0x398 irq 10 -# -# XXX not ready yet: -# Active EICON/Diehl Cards: S, SX, SXn, SCOM or QUADRO -#daic0 at isa? iomem 0xd8000 irq 10 -# -#--------------------------------------------------------------------- -# Supported ISA Plug & Play cards: -# -options ISICPNP_TEL_S0_16_3_P # Teles S0/16PnP (but not 16.3c !) -options ISICPNP_CRTX_S0_P # Creatix ISDN-S0 P&P -options ISICPNP_DRN_NGO # Dr. Neuhaus Niccy GO@ -options ISICPNP_ELSA_QS1ISA # ELSA QuickStep 1000 (ISA Version) -options ISICPNP_ELSA_PCC16 # later variant of ELSA QuickStep -options ISICPNP_SEDLBAUER # Sedlbauer WinSpeed -options ISICPNP_DYNALINK # Dynalink IS64PH -options ISICPNP_SIEMENS_ISURF2 # Siemens I-Surf -options ISICPNP_ITKIX # ITK IX PnP cards -isic* at isapnp? -# -#--------------------------------------------------------------------- -# Supported PCI cards: -# -isic* at pci? - -# Winbond W6692 -iwic* at pci? - -# AVM Fritz!PCI card -ifpci* at pci? - -# AVM Fritz!PCI V2 card -ifritz* at pci? - -# AVM B1/T1 PCI card -iavc* at pci? - -# -#--------------------------------------------------------------------- -# Supported PCMCIA cards: -# -options ISICPCMCIA_AVM_A1 # Fritz!Card PCMCIA Version -options ISICPCMCIA_ELSA_ISDNMC # ELSA MicroLink ISDN/MC -options ISICPCMCIA_ELSA_MCALL # ELSA MicroLink MC/all -options ISICPCMCIA_SBSPEEDSTAR2 # Sedlbauer speed star II -isic* at pcmcia? function ? -# - -#--------------------------------------------------------------------- -# ISDN user land devices, drivers and pseudo-devices. -#--------------------------------------------------------------------- -# -pseudo-device isdn # communication with userland daemon -pseudo-device isdntrc 2 # userland driver to do ISDN tracing -pseudo-device isdnctl # userland driver to control the whole thing -pseudo-device isdnbchan 4 # userland driver for access to raw B channel -pseudo-device isdntel 2 # userland driver for telephony -options IRIP_VJ # compile support for VJ compression -pseudo-device irip 2 # network driver for IP over raw HDLC ISDN -pseudo-device ippp 2 # synchronous PPP over ISDN -#--------------------------------------------------------------------- - options ATHHAL_DEBUG options A9PCIC_DEBUG options AAC_DEBUG @@ -1964,6 +1865,7 @@ options AHD_DEBUG options AHD_DEBUG_OPTS=1 options AH_DEBUG_ALQ options AIC_DEBUG +options AI_DEBUG options ALTQ_DEBUG options AMD756_DEBUG options AMRR_DEBUG @@ -1978,8 +1880,10 @@ options ATAPI_DEBUG_PROBE options ATA_DEBUG options ATA_RAID_DEBUG options ATE_DEBUG +options ATHN_DEBUG options ATMEL_DEBUG options ATPPC_DEBUG +options ATU_DEBUG options ATW_BBPDEBUG options ATW_DEBUG options ATW_SYNDEBUG @@ -1995,11 +1899,13 @@ options AUSMBUS_PSC_DEBUG options AWACS_DEBUG options AWI_DEBUG options AXE_DEBUG +options AXEN_DEBUG options AZALIA_DEBUG options BAH_DEBUG options BCACHE_DEBUG options BDEBUG options BEDEBUG +options BGE_DEBUG options BHADEBUG options BIOS_MEMORY_DEBUG options BIT3DEBUG @@ -2007,6 +1913,7 @@ options BKTR_RADIO_DEBUG options BLUETOOTH_DEBUG options BMAC_DEBUG options BMD_DEBUG +options BNX_DEBUG options BOOTP_DEBUG options BOOTP_DEBUGx options BOOTXX_DEBUG @@ -2018,8 +1925,10 @@ options BTLBDEBUG options BTNMGRDEBUG options BUS_DMA_DEBUG options BUS_SPACE_DEBUG +options BWFM_DEBUG options CACHE_DEBUG options CARDBUS_DEBUG +options CAS_DEBUG options CD18XXDEBUG options CGSIX_DEBUG options CHANGER_DEBUG @@ -2027,6 +1936,7 @@ options CISS_DEBUG options CKSUMDEBUG options CLOCKDEBUG options CLOCK_DEBUG +options CMALO_DEBUG options CNW_DEBUG options COMDEBUG options COMVRIPDEBUG @@ -2074,7 +1984,6 @@ options DEBUG_FIND_PCIC_I82365SL_ONLY options DEBUG_FPE options DEBUG_GPIO options DEBUG_GPIO2 -options DEBUG_IBCS2 options DEBUG_IPR_VJ options DEBUG_ISAPNP options DEBUG_ISSIGNAL @@ -2113,7 +2022,6 @@ options DL_DEBUG options DMAC_DEBUG options DMA_DEBUG options DMCDEBUG -options DO_I4B_MAXDEBUG options DRACORAWKEYDEBUG options EARLY_DEBUG_EVENT options EBUS_DEBUG @@ -2121,6 +2029,7 @@ options EDC_DEBUG options EDEBUG options ED_DEBUG options EFINET_DEBUG +options EF_DEBUG options EGAFONTDEBUG options EGDEBUG options EHCI_DEBUG @@ -2181,9 +2090,6 @@ options HP_DEBUG options HSCXADEBUG options HSCXBDEBUG options I2ODEBUG -options I4BISPPPDEBUG -options I4B_MBUF_DEBUG -options I4B_MBUF_TYPE_DEBUG options ICONV_DEBUG options ICP_DEBUG options IEDEBUG @@ -2210,6 +2116,8 @@ options ITE8181DEBUG options ITK_PROBE_DEBUG options IWI_DEBUG options IWM_DEBUG +options IWN_DEBUG +options IX_DEBUG options IYDEBUG options IYMEMDEBUG options J6X0TP_DEBUG @@ -2226,6 +2134,7 @@ options LCD_DEBUG options LEDEBUG options LE_DEBUG options LIFDEBUG +options LII_DEBUG options LINUX_SG_DEBUG options LLCDEBUG options LLC_DEBUG @@ -2252,6 +2161,7 @@ options MQ200_DEBUG options MRT6DEBUG options MSDOSFS_DEBUG options MSG_DEBUG_OK +options MSK_DEBUG options MULAW_DEBUG options MYDEV_DEBUG options NB_DEBUG @@ -2284,6 +2194,7 @@ options ONOE_DEBUG options OPTPOINTDEBUG options OSIOP_DEBUG options OST_DEBUG +options OTUS_DEBUG options P1212_DEBUG options PARDEBUG options PBMS_DEBUG @@ -2343,6 +2254,8 @@ options RQDEBUG options RTC_DEBUG options RTSOCK_DEBUG options RTW_DEBUG +options RUM_DEBUG +options RUN_DEBUG options SACKBCDEBUG options SBC_DEBUG options SBJCN_DEBUG @@ -2467,16 +2380,22 @@ options UKYOPON_DEBUG options ULPT_DEBUG options UL_DEBUG options UMASS_DEBUG +options UMB_DEBUG options UMCT_DEBUG options UMIDIQUIRK_DEBUG options UMIDI_DEBUG options UMODEM_DEBUG options UNIV_DEBUG +options UPGT_DEBUG options UPLCOM_DEBUG options UPL_DEBUG +options URAL_DEBUG options URIO_DEBUG options URLPHY_DEBUG options URL_DEBUG +options URNDIS_DEBUG +options URTW_DEBUG +options URTWN_DEBUG options USB_DEBUG options USCANNER_DEBUG options USEFULL_DEBUG @@ -2521,6 +2440,7 @@ options WFQ_DEBUG options WI_DEBUG options WI_RING_DEBUG options WM_DEBUG +options WPI_DEBUG options WSKBD_DEBUG options WSMUX_DEBUG options XBD_DEBUG @@ -2528,7 +2448,6 @@ options XDC_DEBUG options XDDEBUG options XDEBUG options XENDEBUG -options XENDEBUG_LOW options XENDEBUG_NET options XENDEBUG_VBD options XENNET_DEBUG @@ -2536,9 +2455,9 @@ options XENNET_DEBUG_DUMP options XEN_CLOCK_DEBUG options XE_DEBUG options XHCI_DEBUG -options XXXXENDEBUG_LOW options XYC_DEBUG options ZSKBD_DEBUG options ZSMACDEBUG +options ZYD_DEBUG options xSCSI_DEBUG options xSD_DEBUG