CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: hannken Date: Fri May 1 14:15:41 UTC 2020 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Remove wd* at umass?, it was dropped. To generate a diff of this commit: cvs rdiff -u -r1.490 -r1.491 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.490 src/sys/arch/i386/conf/ALL:1.491 --- src/sys/arch/i386/conf/ALL:1.490 Wed Mar 25 17:06:19 2020 +++ src/sys/arch/i386/conf/ALL Fri May 1 14:15:41 2020 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.490 2020/03/25 17:06:19 jdolecek Exp $ +# $NetBSD: ALL,v 1.491 2020/05/01 14:15:41 hannken 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.490 $" +#ident "ALL-$Revision: 1.491 $" maxusers 64 # estimated number of users @@ -1302,7 +1302,6 @@ uhso* at uhub? port ? configuration ? # USB Mass Storage umass* at uhub? port ? configuration ? interface ? -wd* at umass? # USB audio uaudio* at uhub? port ? configuration ?
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jdolecek Date: Fri Apr 10 20:56:56 UTC 2020 Modified Files: src/sys/arch/i386/conf: XEN3PAE_DOM0 XEN3PAE_DOMU Log Message: remove commented out __XEN_INTERFACE_VERSION__ option, it comes via std.xen To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/i386/conf/XEN3PAE_DOM0 cvs rdiff -u -r1.9 -r1.10 src/sys/arch/i386/conf/XEN3PAE_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/XEN3PAE_DOM0 diff -u src/sys/arch/i386/conf/XEN3PAE_DOM0:1.22 src/sys/arch/i386/conf/XEN3PAE_DOM0:1.23 --- src/sys/arch/i386/conf/XEN3PAE_DOM0:1.22 Thu Apr 9 14:39:10 2020 +++ src/sys/arch/i386/conf/XEN3PAE_DOM0 Fri Apr 10 20:56:56 2020 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3PAE_DOM0,v 1.22 2020/04/09 14:39:10 jdolecek Exp $ +# $NetBSD: XEN3PAE_DOM0,v 1.23 2020/04/10 20:56:56 jdolecek Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -18,7 +18,6 @@ maxusers 32 # estimated number of users # options XEN options PAE -#options __XEN_INTERFACE_VERSION__=0x00030205 # Xen 3.1 interface # boot messages with MPBIOS, acpi and ioapic can be quite large options MSGBUFSIZE=24576 Index: src/sys/arch/i386/conf/XEN3PAE_DOMU diff -u src/sys/arch/i386/conf/XEN3PAE_DOMU:1.9 src/sys/arch/i386/conf/XEN3PAE_DOMU:1.10 --- src/sys/arch/i386/conf/XEN3PAE_DOMU:1.9 Thu Apr 9 14:39:10 2020 +++ src/sys/arch/i386/conf/XEN3PAE_DOMU Fri Apr 10 20:56:56 2020 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3PAE_DOMU,v 1.9 2020/04/09 14:39:10 jdolecek Exp $ +# $NetBSD: XEN3PAE_DOMU,v 1.10 2020/04/10 20:56:56 jdolecek Exp $ include "arch/i386/conf/std.xen" @@ -150,7 +150,6 @@ options NFS_BOOT_DHCP,NFS_BOOT_BOOTPARA #options NFS_BOOTSTATIC_SERVADDR="\"169.254.1.1\"" #options NFS_BOOTSTATIC_SERVER="\"server:/path/to/root\"" -#options __XEN_INTERFACE_VERSION__=0x00030205 # Xen 3.1 interface options MAXPHYS=32768 #xbd doesn't handle 64k transfers config netbsd root on ? type ?
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: isaki Date: Sat Mar 16 04:31:25 UTC 2019 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Remove duplicated option. To generate a diff of this commit: cvs rdiff -u -r1.464 -r1.465 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.464 src/sys/arch/i386/conf/ALL:1.465 --- src/sys/arch/i386/conf/ALL:1.464 Sun Feb 24 20:56:27 2019 +++ src/sys/arch/i386/conf/ALL Sat Mar 16 04:31:25 2019 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.464 2019/02/24 20:56:27 kamil Exp $ +# $NetBSD: ALL,v 1.465 2019/03/16 04:31:25 isaki 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.464 $" +#ident "ALL-$Revision: 1.465 $" maxusers 64 # estimated number of users @@ -110,7 +110,6 @@ options BUFQ_PRIOCSCAN # Diagnostic/debugging support options options DIAGNOSTIC # inexpensive kernel consistency checks options DEBUG # expensive debugging checks/support -options KUBSAN # Kernel Undefined Behavior Sanitizer (kUBSan) options LOCKDEBUG # expensive locking checks/support options DDB # in-kernel debugger options DDB_ONPANIC=1 # see also sysctl(7): `ddb.onpanic'
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: nonaka Date: Fri Mar 1 12:23:10 UTC 2019 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: commented out hvkvp entry. To generate a diff of this commit: cvs rdiff -u -r1.1203 -r1.1204 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1203 src/sys/arch/i386/conf/GENERIC:1.1204 --- src/sys/arch/i386/conf/GENERIC:1.1203 Fri Mar 1 08:17:51 2019 +++ src/sys/arch/i386/conf/GENERIC Fri Mar 1 12:23:10 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1203 2019/03/01 08:17:51 nonaka Exp $ +# $NetBSD: GENERIC,v 1.1204 2019/03/01 12:23:10 nonaka Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1203 $" +#ident "GENERIC-$Revision: 1.1204 $" maxusers 64 # estimated number of users @@ -1433,7 +1433,7 @@ hvs* at vmbus? # Hyper-V StorVSC hvheartbeat* at vmbus? # Hyper-V Heartbeat Service hvshutdown* at vmbus? # Hyper-V Guest Shutdown Service hvtimesync* at vmbus? # Hyper-V Time Synchronization Service -hvkvp* at vmbus? # Hyper-V Data Exchange Service +#hvkvp* at vmbus? # Hyper-V Data Exchange Service # Pull in optional local configuration
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: kamil Date: Sun Feb 24 20:56:28 UTC 2019 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Enable kUBSan and KCOV in NetBSD/i386 kernel=ALL To generate a diff of this commit: cvs rdiff -u -r1.463 -r1.464 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.463 src/sys/arch/i386/conf/ALL:1.464 --- src/sys/arch/i386/conf/ALL:1.463 Wed Feb 6 11:58:31 2019 +++ src/sys/arch/i386/conf/ALL Sun Feb 24 20:56:27 2019 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.463 2019/02/06 11:58:31 rin Exp $ +# $NetBSD: ALL,v 1.464 2019/02/24 20:56:27 kamil 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.463 $" +#ident "ALL-$Revision: 1.464 $" maxusers 64 # estimated number of users @@ -110,6 +110,7 @@ options BUFQ_PRIOCSCAN # Diagnostic/debugging support options options DIAGNOSTIC # inexpensive kernel consistency checks options DEBUG # expensive debugging checks/support +options KUBSAN # Kernel Undefined Behavior Sanitizer (kUBSan) options LOCKDEBUG # expensive locking checks/support options DDB # in-kernel debugger options DDB_ONPANIC=1 # see also sysctl(7): `ddb.onpanic' @@ -118,6 +119,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) @@ -125,6 +127,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
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: kamil Date: Sat Feb 23 12:28:22 UTC 2019 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: Register kUBSan and KCOV in kernel=GENERIC of NetBSD/i386 Both options are disabled by default. To generate a diff of this commit: cvs rdiff -u -r1.1201 -r1.1202 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1201 src/sys/arch/i386/conf/GENERIC:1.1202 --- src/sys/arch/i386/conf/GENERIC:1.1201 Fri Feb 15 08:54:01 2019 +++ src/sys/arch/i386/conf/GENERIC Sat Feb 23 12:28:22 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1201 2019/02/15 08:54:01 nonaka Exp $ +# $NetBSD: GENERIC,v 1.1202 2019/02/23 12:28:22 kamil Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1201 $" +#ident "GENERIC-$Revision: 1.1202 $" maxusers 64 # estimated number of users @@ -120,11 +120,16 @@ options DDB_HISTORY_SIZE=512 # enable h #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) options KDTRACE_HOOKS # kernel DTrace hooks +# Kernel Code Coverage Driver. +#makeoptions KCOV=1 +#options KCOV + # Compatibility options include "conf/compat_netbsd09.config" #options COMPAT_386BSD_MBRPART # recognize old partition ID
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: christos Date: Mon Dec 3 00:11:39 UTC 2018 Modified Files: src/sys/arch/i386/conf: files.i386 Log Message: KASLR is in files.kern To generate a diff of this commit: cvs rdiff -u -r1.396 -r1.397 src/sys/arch/i386/conf/files.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/files.i386 diff -u src/sys/arch/i386/conf/files.i386:1.396 src/sys/arch/i386/conf/files.i386:1.397 --- src/sys/arch/i386/conf/files.i386:1.396 Sat Aug 25 03:48:56 2018 +++ src/sys/arch/i386/conf/files.i386 Sun Dec 2 19:11:39 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.i386,v 1.396 2018/08/25 07:48:56 maxv Exp $ +# $NetBSD: files.i386,v 1.397 2018/12/03 00:11:39 christos Exp $ # # new style config file for i386 architecture # @@ -18,8 +18,6 @@ defparam CPURESET_DELAY # Obsolete Xbox support obsolete defflag XBOX -defflag KASLR - # User-settable LDT (used by WINE) defflag USER_LDT
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: martin Date: Thu Nov 1 13:11:11 UTC 2018 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: Add bwfm at pci To generate a diff of this commit: cvs rdiff -u -r1.1192 -r1.1193 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1192 src/sys/arch/i386/conf/GENERIC:1.1193 --- src/sys/arch/i386/conf/GENERIC:1.1192 Thu Sep 6 05:36:50 2018 +++ src/sys/arch/i386/conf/GENERIC Thu Nov 1 13:11:11 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1192 2018/09/06 05:36:50 maxv Exp $ +# $NetBSD: GENERIC,v 1.1193 2018/11/01 13:11:11 martin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1192 $" +#ident "GENERIC-$Revision: 1.1193 $" maxusers 64 # estimated number of users @@ -975,6 +975,7 @@ bce* at pci? dev ? function ? # Broadcom bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet bwi* at pci? dev ? function ? # Broadcom BCM43xx wireless +bwfm* at pci? dev ? function ? # Broadcom FullMAC dge* at pci? dev ? function ? # Intel 82597 10GbE LR ep* at pci? dev ? function ? # 3Com 3c59x epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: riastradh Date: Mon Aug 27 16:29:18 UTC 2018 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Add amdgpu to i386/ALL. To generate a diff of this commit: cvs rdiff -u -r1.449 -r1.450 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.449 src/sys/arch/i386/conf/ALL:1.450 --- src/sys/arch/i386/conf/ALL:1.449 Sat Aug 25 20:52:41 2018 +++ src/sys/arch/i386/conf/ALL Mon Aug 27 16:29:18 2018 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.449 2018/08/25 20:52:41 rin Exp $ +# $NetBSD: ALL,v 1.450 2018/08/27 16:29:18 riastradh 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.449 $" +#ident "ALL-$Revision: 1.450 $" maxusers 64 # estimated number of users @@ -600,6 +600,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?
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: mrg Date: Mon Aug 13 18:48:53 UTC 2018 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: use dev/usb/usbdevices.config instead of a local list. adds slurm(4), umcs(4), uark(4), and usmsc(4). To generate a diff of this commit: cvs rdiff -u -r1.1187 -r1.1188 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1187 src/sys/arch/i386/conf/GENERIC:1.1188 --- src/sys/arch/i386/conf/GENERIC:1.1187 Sun Aug 12 17:59:21 2018 +++ src/sys/arch/i386/conf/GENERIC Mon Aug 13 18:48:53 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1187 2018/08/12 17:59:21 sevan Exp $ +# $NetBSD: GENERIC,v 1.1188 2018/08/13 18:48:53 mrg Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1187 $" +#ident "GENERIC-$Revision: 1.1188 $" maxusers 64 # estimated number of users @@ -1179,183 +1179,7 @@ usb* at ohci? usb* at slhci? usb* at uhci? -# USB Hubs -uhub* at usb? -uhub* at uhub? port ? - -# USB HID device -uhidev* at uhub? port ? configuration ? interface ? - -# USB Mice -ums* at uhidev? reportid ? -wsmouse* at ums? mux 0 - -# USB generic touchscreen -uts* at uhidev? reportid ? -wsmouse* at uts? mux 0 - -# USB eGalax touch-panel -uep* at uhub? port ? -wsmouse* at uep? mux 0 - -# USB Keyboards -ukbd* at uhidev? reportid ? -wskbd* at ukbd? console ? mux 1 - -# USB TEMPer and TEMPerHUM -uthum* at uhidev? reportid ? - -# USB serial adapter -ucycom* at uhidev? reportid ? - -# USB Generic HID devices -uhid* at uhidev? reportid ? - -# USB LCDs and USB-VGA adaptors -udl* at uhub? port ? # DisplayLink DL-1x0/1x5 -wsdisplay* at udl? - -# USB Printer -ulpt* at uhub? port ? configuration ? interface ? - -# USB Modem -umodem* at uhub? port ? configuration ? -ucom* at umodem? - -# Option N.V. Wireless WAN modems -uhso* at uhub? port ? configuration ? - -# USB Mass Storage -umass* at uhub? port ? configuration ? interface ? -wd* at umass? - -# USB audio -uaudio* at uhub? port ? configuration ? -uaudio* at usbifif? - -# USB MIDI -umidi* at uhub? port ? configuration ? - -# USB IrDA -# USB-IrDA bridge spec -uirda* at uhub? port ? configuration ? interface ? -irframe* at uirda? - -stuirda* at uhub? port ? configuration ? interface ? -irframe* at stuirda? - -# SigmaTel STIr4200 USB/IrDA Bridge -ustir* at uhub? port ? -irframe* at ustir? - -# KingSun/DonShine USB/IrDA Bridge -udsir* at uhub? port ? -irframe* at udsir? - -# Windows Media Center IR transceiver -irmce* at uhub? port ? -cir* at irmce? - -# USB Ethernet adapters -aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters -axe* at uhub? port ? # ASIX AX88172 based adapters -axen* at uhub? port ? # ASIX AX88178a/AX88179 based adapters -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 -udav* at uhub? port ? # Davicom DM9601 based adapters -#umb* at uhub? port ? # Mobile Broadband Interface Model (EXPERIMENTAL) -url* at uhub? port ? # Realtek RTL8150L based adapters -urndis* at uhub? port ? # Microsoft RNDIS specification - -# USB 802.11 adapters -athn* at uhub? port ? # Atheros AR9002U -atu* at uhub? port ? # Atmel AT76C50XX based adapters -bwfm* at uhub? port ? # Broadcom FullMAC -otus* at uhub? port ? # Atheros AR9001U -rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g -run* at uhub? port ? # Ralink Technology RT(2[78]|30)00 802.11a/b/g/n -upgt* at uhub? port ? # Intersil PrismGT -ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g -urtw* at uhub? port ? # Realtek RTL8187/RTL8187B 802.11b/g -urtwn* at uhub? port ? # Realtek RTL8188CU/RTL8192CU 802.11b/g/n -zyd* at uhub? port ? # Zydas ZD1211 - -# Prolific PL2301/PL2302 host-to-host adapter -upl* at uhub? port ? - -# Serial adapters -ubsa* at uhub? port ? # Belkin serial adapter -ucom* at ubsa? portno ? - -uchcom* at uhub? port ? # WinChipHead CH341/CH340 serial adapter -ucom* at uchcom? portno ? - -uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter -ucom* at uftdi? portno ? - -uipaq* at uhub? port ? # iPAQ PDAs -ucom* at uipaq? portno ? - -umct* at uhub? port ? # MCT USB-RS232 serial adapter -ucom* at umct? portno ? - -uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter -ucom* at uplcom? portno ? - -uslsa* at uhub? port ? # Silicon Labs USB-RS232 serial adapter -ucom* at uslsa? portno ? - -uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter -ucom* at uvscom? portno ? - -# RIM BlackBerry -uberry* at uhub? port ? - -# Apple iPad -uipad* at uhub? port ? - -# Diamond Multimedia Rio 500 -urio* at uhub? port ? - -# USB Handspring
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: christos Date: Tue Jun 5 00:58:42 UTC 2018 Modified Files: src/sys/arch/i386/conf: Makefile.i386 Log Message: No need for NORELRO here. To generate a diff of this commit: cvs rdiff -u -r1.192 -r1.193 src/sys/arch/i386/conf/Makefile.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/Makefile.i386 diff -u src/sys/arch/i386/conf/Makefile.i386:1.192 src/sys/arch/i386/conf/Makefile.i386:1.193 --- src/sys/arch/i386/conf/Makefile.i386:1.192 Mon Jun 4 16:28:44 2018 +++ src/sys/arch/i386/conf/Makefile.i386 Mon Jun 4 20:58:42 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.i386,v 1.192 2018/06/04 20:28:44 christos Exp $ +# $NetBSD: Makefile.i386,v 1.193 2018/06/05 00:58:42 christos Exp $ # Makefile for NetBSD # @@ -18,7 +18,6 @@ # makeoptions DEBUGLIST="uvm* trap if_*" NOSANITIZER= # defined -NORELRO= # defined MACHINE_ARCH= i386 USETOOLS?= no NEED_OWN_INSTALL_TARGET?=no
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: christos Date: Mon Jun 4 20:28:44 UTC 2018 Modified Files: src/sys/arch/i386/conf: Makefile.i386 Log Message: Disable RELRO/SANITIZER To generate a diff of this commit: cvs rdiff -u -r1.191 -r1.192 src/sys/arch/i386/conf/Makefile.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/Makefile.i386 diff -u src/sys/arch/i386/conf/Makefile.i386:1.191 src/sys/arch/i386/conf/Makefile.i386:1.192 --- src/sys/arch/i386/conf/Makefile.i386:1.191 Wed Apr 18 06:40:22 2018 +++ src/sys/arch/i386/conf/Makefile.i386 Mon Jun 4 16:28:44 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.i386,v 1.191 2018/04/18 10:40:22 martin Exp $ +# $NetBSD: Makefile.i386,v 1.192 2018/06/04 20:28:44 christos Exp $ # Makefile for NetBSD # @@ -17,6 +17,8 @@ # # makeoptions DEBUGLIST="uvm* trap if_*" +NOSANITIZER= # defined +NORELRO= # defined MACHINE_ARCH= i386 USETOOLS?= no NEED_OWN_INSTALL_TARGET?=no
CVS commit: src/sys/arch/i386/conf
Module Name:src
Committed By: martin
Date: Wed Apr 18 10:40:22 UTC 2018
Modified Files:
src/sys/arch/i386/conf: Makefile.i386
Log Message:
Make SPECTRE_V2_GCC_MITIGATION overridable at the make command line.
To generate a diff of this commit:
cvs rdiff -u -r1.190 -r1.191 src/sys/arch/i386/conf/Makefile.i386
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/Makefile.i386
diff -u src/sys/arch/i386/conf/Makefile.i386:1.190 src/sys/arch/i386/conf/Makefile.i386:1.191
--- src/sys/arch/i386/conf/Makefile.i386:1.190 Sat Apr 7 19:38:06 2018
+++ src/sys/arch/i386/conf/Makefile.i386 Wed Apr 18 10:40:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.i386,v 1.190 2018/04/07 19:38:06 mrg Exp $
+# $NetBSD: Makefile.i386,v 1.191 2018/04/18 10:40:22 martin Exp $
# Makefile for NetBSD
#
@@ -39,7 +39,7 @@ CFLAGS+= -msoft-float
## no-sse implies no-sse2 but not no-avx
CFLAGS+= -mno-mmx -mno-sse -mno-avx
-.if !empty(SPECTRE_V2_GCC_MITIGATION) && ${HAVE_GCC:U0} > 0
+.if ${SPECTRE_V2_GCC_MITIGATION:U0} > 0 && ${HAVE_GCC:U0} > 0
CFLAGS+= -mindirect-branch=thunk
CFLAGS+= -mindirect-branch-register
.endif
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: sevan Date: Sat Feb 17 01:34:45 UTC 2018 Modified Files: src/sys/arch/i386/conf: XEN3_DOM0 XEN3_DOMU Log Message: With the introduction of ddb.dumpstack which is enabled by default, we no longer need to explicitly set DDB_COMMANDONENTER to run a trace. To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r1.88 -r1.89 src/sys/arch/i386/conf/XEN3_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/XEN3_DOM0 diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.126 src/sys/arch/i386/conf/XEN3_DOM0:1.127 --- src/sys/arch/i386/conf/XEN3_DOM0:1.126 Mon Feb 5 11:19:55 2018 +++ src/sys/arch/i386/conf/XEN3_DOM0 Sat Feb 17 01:34:45 2018 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.126 2018/02/05 11:19:55 bouyer Exp $ +# $NetBSD: XEN3_DOM0,v 1.127 2018/02/17 01:34:45 sevan Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -75,7 +75,7 @@ options DDB_HISTORY_SIZE=512 # enable h #options KGDB # remote debugger #options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x2f8,KGDB_DEVRATE=57600 #makeoptions DEBUG="-g" # compile full symbol table -options DDB_COMMANDONENTER="trace;show registers" +options DDB_COMMANDONENTER="show registers" # Compatibility options include "conf/compat_netbsd09.config" Index: src/sys/arch/i386/conf/XEN3_DOMU diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.88 src/sys/arch/i386/conf/XEN3_DOMU:1.89 --- src/sys/arch/i386/conf/XEN3_DOMU:1.88 Tue Jan 23 15:08:12 2018 +++ src/sys/arch/i386/conf/XEN3_DOMU Sat Feb 17 01:34:45 2018 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.88 2018/01/23 15:08:12 sevan Exp $ +# $NetBSD: XEN3_DOMU,v 1.89 2018/02/17 01:34:45 sevan Exp $ include "arch/xen/conf/std.xen" @@ -59,7 +59,7 @@ options DDB_HISTORY_SIZE=512 # enable h #options KGDB # remote debugger #options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x2f8,KGDB_DEVRATE=57600 #makeoptions DEBUG="-g" # compile full symbol table -options DDB_COMMANDONENTER="trace;show registers" +options DDB_COMMANDONENTER="show registers" # Compatibility options include "conf/compat_netbsd09.config"
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: maxv Date: Sat Jan 27 07:51:04 UTC 2018 Removed Files: src/sys/arch/i386/conf: kern.ldscript.4MB largepages.inc Log Message: Remove these files. No one cares about this on i386, and there is no point in keeping undocumented options nobody understands anyway. To generate a diff of this commit: cvs rdiff -u -r1.19 -r0 src/sys/arch/i386/conf/kern.ldscript.4MB cvs rdiff -u -r1.4 -r0 src/sys/arch/i386/conf/largepages.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: rin Date: Mon Dec 25 06:35:57 UTC 2017 Modified Files: src/sys/arch/i386/conf: INSTALL Log Message: install/52845: Enable vga@isa and pcdisplay for INSTALL. Otherwise, install media do not boot on pre-PCI machines. XXX pullup to netbsd-8 and netbsd-7 To generate a diff of this commit: cvs rdiff -u -r1.331 -r1.332 src/sys/arch/i386/conf/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/INSTALL diff -u src/sys/arch/i386/conf/INSTALL:1.331 src/sys/arch/i386/conf/INSTALL:1.332 --- src/sys/arch/i386/conf/INSTALL:1.331 Sun Nov 2 23:14:20 2014 +++ src/sys/arch/i386/conf/INSTALL Mon Dec 25 06:35:57 2017 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.331 2014/11/02 23:14:20 christos Exp $ +# $NetBSD: INSTALL,v 1.332 2017/12/25 06:35:57 rin Exp $ # # INSTALL - Installation kernel. # @@ -7,7 +7,7 @@ include "arch/i386/conf/MONOLITHIC" -#ident "INSTALL-$Revision: 1.331 $" +#ident "INSTALL-$Revision: 1.332 $" no options MEMORY_DISK_DYNAMIC options MEMORY_DISK_IS_ROOT # force root on memory disk @@ -19,3 +19,8 @@ options MEMORY_DISK_RBFLAGS=RB_SINGLE # no i915drmkms* at pci? no radeon* at pci? #no nouveau* at pci? + +# pre-PCI graphics drivers, not enabled in GENERIC +vga0 at isa? +pcdisplay0 at isa? # CGA, MDA, EGA, HGA +wsdisplay* at pcdisplay? console ?
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: hannken Date: Sun Dec 10 17:52:13 UTC 2017 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Add option XHCI_DEBUG. To generate a diff of this commit: cvs rdiff -u -r1.432 -r1.433 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.432 src/sys/arch/i386/conf/ALL:1.433 --- src/sys/arch/i386/conf/ALL:1.432 Sun Dec 10 17:19:48 2017 +++ src/sys/arch/i386/conf/ALL Sun Dec 10 17:52:13 2017 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.432 2017/12/10 17:19:48 bouyer Exp $ +# $NetBSD: ALL,v 1.433 2017/12/10 17:52:13 hannken 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.432 $" +#ident "ALL-$Revision: 1.433 $" maxusers 64 # estimated number of users @@ -2531,6 +2531,7 @@ options XENNET_DEBUG options XENNET_DEBUG_DUMP options XEN_CLOCK_DEBUG options XE_DEBUG +options XHCI_DEBUG options ENDEBUG_LOW options XYC_DEBUG options ZSKBD_DEBUG
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jmcneill Date: Thu Nov 30 11:56:45 UTC 2017 Modified Files: src/sys/arch/i386/conf: ALL GENERIC Log Message: add qemufwcfg(4) To generate a diff of this commit: cvs rdiff -u -r1.430 -r1.431 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1171 -r1.1172 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.430 src/sys/arch/i386/conf/ALL:1.431 --- src/sys/arch/i386/conf/ALL:1.430 Thu Sep 14 07:58:41 2017 +++ src/sys/arch/i386/conf/ALL Thu Nov 30 11:56:45 2017 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.430 2017/09/14 07:58:41 mrg Exp $ +# $NetBSD: ALL,v 1.431 2017/11/30 11:56:45 jmcneill 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.430 $" +#ident "ALL-$Revision: 1.431 $" maxusers 64 # estimated number of users @@ -377,6 +377,7 @@ lpt* at acpi? # Parallel port mpu* at acpi? # Roland MPU-401 MIDI UART pckbc* at acpi? # PC keyboard controller pcppi* at acpi? # AT-style speaker sound +qemufwcfg* at acpi? # QEMU Firmware Configuration device thinkpad* at acpi? # IBM/Lenovo Thinkpad hotkeys #tpm* at acpi? # ACPI TPM (Experimental) ug* at acpi? # Abit uGuru Hardware monitor Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1171 src/sys/arch/i386/conf/GENERIC:1.1172 --- src/sys/arch/i386/conf/GENERIC:1.1171 Wed Nov 29 16:10:01 2017 +++ src/sys/arch/i386/conf/GENERIC Thu Nov 30 11:56:45 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1171 2017/11/29 16:10:01 martin Exp $ +# $NetBSD: GENERIC,v 1.1172 2017/11/30 11:56:45 jmcneill Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1171 $" +#ident "GENERIC-$Revision: 1.1172 $" maxusers 64 # estimated number of users @@ -351,6 +351,7 @@ joy* at acpi? # Joystick/Game port mpu* at acpi? # Roland MPU-401 MIDI UART pckbc* at acpi? # PC keyboard controller pcppi* at acpi? # AT-style speaker sound +qemufwcfg* at acpi? # QEMU Firmware Configuration device sdhc* at acpi? # SD Host Controller sony* at acpi? # Sony Miscellaneous Controller thinkpad* at acpi? # IBM/Lenovo Thinkpad hotkeys
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: martin Date: Wed Nov 29 16:10:01 UTC 2017 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: PR port-i386/52774: vioscsi missing in i386 kernel To generate a diff of this commit: cvs rdiff -u -r1.1170 -r1.1171 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1170 src/sys/arch/i386/conf/GENERIC:1.1171 --- src/sys/arch/i386/conf/GENERIC:1.1170 Mon Nov 6 02:57:18 2017 +++ src/sys/arch/i386/conf/GENERIC Wed Nov 29 16:10:01 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1170 2017/11/06 02:57:18 rin Exp $ +# $NetBSD: GENERIC,v 1.1171 2017/11/29 16:10:01 martin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1170 $" +#ident "GENERIC-$Revision: 1.1171 $" maxusers 64 # estimated number of users @@ -1595,10 +1595,12 @@ geodecntr* at geodegcb? # AMD Geode SC weasel* at pci? # Virtio devices -virtio* at pci? dev ? function ? # Virtio PCI device -viomb* at virtio? # Virtio memory balloon device -ld* at virtio? # Virtio disk device -vioif* at virtio? # Virtio network device +virtio* at pci? dev ? function ? # Virtio PCI device +viomb* at virtio? # Virtio memory balloon device +ld* at virtio?# Virtio disk device +vioif* at virtio? # Virtio network device +viornd* at virtio? # Virtio entropy device +vioscsi* at virtio? # Virtio SCSI device # Pull in optional local configuration
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: skrll Date: Mon Oct 23 08:08:53 UTC 2017 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: Add bwfm (and sort other 802.11 usb wifi drivers) To generate a diff of this commit: cvs rdiff -u -r1.1168 -r1.1169 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1168 src/sys/arch/i386/conf/GENERIC:1.1169 --- src/sys/arch/i386/conf/GENERIC:1.1168 Thu Sep 14 07:58:41 2017 +++ src/sys/arch/i386/conf/GENERIC Mon Oct 23 08:08:53 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1168 2017/09/14 07:58:41 mrg Exp $ +# $NetBSD: GENERIC,v 1.1169 2017/10/23 08:08:53 skrll Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1168 $" +#ident "GENERIC-$Revision: 1.1169 $" maxusers 64 # estimated number of users @@ -1260,11 +1260,12 @@ urndis* at uhub? port ? # Microsoft RND # USB 802.11 adapters athn* at uhub? port ? # Atheros AR9002U atu* at uhub? port ? # Atmel AT76C50XX based adapters +bwfm* at uhub? port ? # Broadcom FullMAC otus* at uhub? port ? # Atheros AR9001U -ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g run* at uhub? port ? # Ralink Technology RT(2[78]|30)00 802.11a/b/g/n upgt* at uhub? port ? # Intersil PrismGT +ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g urtw* at uhub? port ? # Realtek RTL8187/RTL8187B 802.11b/g urtwn* at uhub? port ? # Realtek RTL8188CU/RTL8192CU 802.11b/g/n zyd* at uhub? port ? # Zydas ZD1211
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: maxv Date: Mon Jul 31 15:43:33 UTC 2017 Modified Files: src/sys/arch/i386/conf: GENERIC GENERIC_TINY NET4501 XEN3_DOM0 XEN3_DOMU Log Message: Disable all the compat options until COMPAT_10. NetBSD 1.0 was released on October 26 1994; 23 years of compatibility is enough. Discussed with christos quickly. To generate a diff of this commit: cvs rdiff -u -r1.1161 -r1.1162 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.151 -r1.152 src/sys/arch/i386/conf/GENERIC_TINY cvs rdiff -u -r1.94 -r1.95 src/sys/arch/i386/conf/NET4501 cvs rdiff -u -r1.117 -r1.118 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r1.81 -r1.82 src/sys/arch/i386/conf/XEN3_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1161 src/sys/arch/i386/conf/GENERIC:1.1162 --- src/sys/arch/i386/conf/GENERIC:1.1161 Sat Jul 29 18:08:58 2017 +++ src/sys/arch/i386/conf/GENERIC Mon Jul 31 15:43:33 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1161 2017/07/29 18:08:58 maxv Exp $ +# $NetBSD: GENERIC,v 1.1162 2017/07/31 15:43:33 maxv Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1161 $" +#ident "GENERIC-$Revision: 1.1162 $" maxusers 64 # estimated number of users @@ -124,8 +124,8 @@ options DDB_HISTORY_SIZE=512 # enable h options KDTRACE_HOOKS # kernel DTrace hooks # Compatibility options -options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI -options COMPAT_09 # NetBSD 0.9, +#options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI +#options COMPAT_09 # NetBSD 0.9, options COMPAT_10 # NetBSD 1.0, options COMPAT_11 # NetBSD 1.1, options COMPAT_12 # NetBSD 1.2 (and 386BSD and BSDI), @@ -139,7 +139,7 @@ options COMPAT_40 # NetBSD 4.0, options COMPAT_50 # NetBSD 5.0, options COMPAT_60 # NetBSD 6.0, and options COMPAT_70 # NetBSD 7.0 binary compatibility. -options COMPAT_43 # 4.3BSD, 386BSD, and BSDI +#options COMPAT_43 # 4.3BSD, 386BSD, and BSDI #options COMPAT_386BSD_MBRPART # recognize old partition ID options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility Index: src/sys/arch/i386/conf/GENERIC_TINY diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.151 src/sys/arch/i386/conf/GENERIC_TINY:1.152 --- src/sys/arch/i386/conf/GENERIC_TINY:1.151 Sat Jul 29 18:08:58 2017 +++ src/sys/arch/i386/conf/GENERIC_TINY Mon Jul 31 15:43:33 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_TINY,v 1.151 2017/07/29 18:08:58 maxv Exp $ +# $NetBSD: GENERIC_TINY,v 1.152 2017/07/31 15:43:33 maxv Exp $ # # GENERIC_TINY -- suitable default for 4M machines # No EISA, PCI, or SCSI. @@ -72,7 +72,7 @@ options COMPAT_40 # NetBSD 4.0, options COMPAT_50 # NetBSD 5.0, options COMPAT_60 # NetBSD 6.0, and options COMPAT_70 # NetBSD 7.0 binary compatibility. -options COMPAT_43 # 4.3BSD, 386BSD, and BSDI +#options COMPAT_43 # 4.3BSD, 386BSD, and BSDI #options COMPAT_386BSD_MBRPART # recognize old partition ID #options COMPAT_IBCS2 # binary compatibility with SCO and ISC Index: src/sys/arch/i386/conf/NET4501 diff -u src/sys/arch/i386/conf/NET4501:1.94 src/sys/arch/i386/conf/NET4501:1.95 --- src/sys/arch/i386/conf/NET4501:1.94 Sat Jul 29 18:08:58 2017 +++ src/sys/arch/i386/conf/NET4501 Mon Jul 31 15:43:33 2017 @@ -1,4 +1,4 @@ -# $NetBSD: NET4501,v 1.94 2017/07/29 18:08:58 maxv Exp $ +# $NetBSD: NET4501,v 1.95 2017/07/31 15:43:33 maxv Exp $ # # NET4501 -- kernel configuration for a Soekris Engineering net4501 # single-board computer. @@ -10,7 +10,7 @@ include "arch/i386/conf/std.i386" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "NET4501-$Revision: 1.94 $" +#ident "NET4501-$Revision: 1.95 $" maxusers 32 # estimated number of users @@ -77,8 +77,8 @@ options DDB_HISTORY_SIZE=512 # enable h #makeoptions DEBUG="-g" # compile full symbol table # Compatibility options -options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI -options COMPAT_09 # NetBSD 0.9, +#options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI +#options COMPAT_09 # NetBSD 0.9, options COMPAT_10 # NetBSD 1.0, options COMPAT_11 # NetBSD 1.1, options COMPAT_12 # NetBSD 1.2 (and 386BSD and BSDI), @@ -92,7 +92,7 @@ options COMPAT_40 # NetBSD 4.0, options COMPAT_50 # NetBSD 5.0, options COMPAT_60 # NetBSD 6.0, and options COMPAT_70 # NetBSD 7.0 binary compatibility. -options COMPAT_43 # 4.3BSD, 386BSD, and BSDI compatibility. +#options COMPAT_43 # 4.3BSD, 386BSD, and BSDI compatibility. options COMPAT_386BSD_MBRPART # recognize old partition ID #options COMPAT_IBCS2 # binary compatibility with SCO and ISC Index: src/sys/arch/i386/conf/XEN3_DOM0 diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.117 src/sys/arch/i386/conf/XEN3_DOM0:1.118 --- src/sys/arc
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: maxv Date: Sat Jul 29 12:00:56 UTC 2017 Modified Files: src/sys/arch/i386/conf: ALL GENERIC GENERIC_TINY INSTALL_FLOPPY INSTALL_TINY MODULAR NET4501 XEN3_DOM0 XEN3_DOMU Log Message: Remove svr4 from the config files. To generate a diff of this commit: cvs rdiff -u -r1.422 -r1.423 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1159 -r1.1160 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.149 -r1.150 src/sys/arch/i386/conf/GENERIC_TINY cvs rdiff -u -r1.37 -r1.38 src/sys/arch/i386/conf/INSTALL_FLOPPY cvs rdiff -u -r1.150 -r1.151 src/sys/arch/i386/conf/INSTALL_TINY cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/conf/MODULAR cvs rdiff -u -r1.92 -r1.93 src/sys/arch/i386/conf/NET4501 cvs rdiff -u -r1.115 -r1.116 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r1.79 -r1.80 src/sys/arch/i386/conf/XEN3_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.422 src/sys/arch/i386/conf/ALL:1.423 --- src/sys/arch/i386/conf/ALL:1.422 Sat Jul 29 07:19:47 2017 +++ src/sys/arch/i386/conf/ALL Sat Jul 29 12:00:56 2017 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.422 2017/07/29 07:19:47 maxv Exp $ +# $NetBSD: ALL,v 1.423 2017/07/29 12:00:56 maxv 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.422 $" +#ident "ALL-$Revision: 1.423 $" maxusers 64 # estimated number of users @@ -149,7 +149,6 @@ options COMPAT_386BSD_MBRPART # recogni options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility -options COMPAT_SVR4 # binary compatibility with SVR4 options COMPAT_IBCS2 # binary compatibility with SCO and ISC options COMPAT_LINUX # binary compatibility with Linux options COMPAT_FREEBSD # binary compatibility with FreeBSD @@ -2105,7 +2104,6 @@ options DEBUG_PTM options DEBUG_RAWFS options DEBUG_RPC options DEBUG_SNAPPER -options DEBUG_SVR4 options DEBUG_SYNC options DEBUG_TERM options DEBUG_UL Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1159 src/sys/arch/i386/conf/GENERIC:1.1160 --- src/sys/arch/i386/conf/GENERIC:1.1159 Fri Jul 28 14:13:13 2017 +++ src/sys/arch/i386/conf/GENERIC Sat Jul 29 12:00:56 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1159 2017/07/28 14:13:13 maxv Exp $ +# $NetBSD: GENERIC,v 1.1160 2017/07/29 12:00:56 maxv Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1159 $" +#ident "GENERIC-$Revision: 1.1160 $" maxusers 64 # estimated number of users @@ -144,7 +144,6 @@ options COMPAT_43 # 4.3BSD, 386BSD, and #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility -#options COMPAT_SVR4 # binary compatibility with SVR4 #options COMPAT_IBCS2 # binary compatibility with SCO and ISC options COMPAT_LINUX # binary compatibility with Linux #options COMPAT_FREEBSD # binary compatibility with FreeBSD Index: src/sys/arch/i386/conf/GENERIC_TINY diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.149 src/sys/arch/i386/conf/GENERIC_TINY:1.150 --- src/sys/arch/i386/conf/GENERIC_TINY:1.149 Sun Feb 26 12:21:15 2017 +++ src/sys/arch/i386/conf/GENERIC_TINY Sat Jul 29 12:00:56 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_TINY,v 1.149 2017/02/26 12:21:15 maya Exp $ +# $NetBSD: GENERIC_TINY,v 1.150 2017/07/29 12:00:56 maxv Exp $ # # GENERIC_TINY -- suitable default for 4M machines # No EISA, PCI, or SCSI. @@ -76,7 +76,6 @@ options COMPAT_43 # 4.3BSD, 386BSD, and #options COMPAT_386BSD_MBRPART # recognize old partition ID #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. -#options COMPAT_SVR4 # binary compatibility with SVR4 #options COMPAT_IBCS2 # binary compatibility with SCO and ISC #options COMPAT_LINUX # binary compatibility with Linux #options COMPAT_FREEBSD # binary compatibility with FreeBSD Index: src/sys/arch/i386/conf/INSTALL_FLOPPY diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.37 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.38 --- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.37 Sun Feb 26 12:21:15 2017 +++ src/sys/arch/i386/conf/INSTALL_FLOPPY Sat Jul 29 12:00:56 2017 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_FLOPPY,v 1.37 2017/02/26 12:21:15 maya Exp $ +# $NetBSD: INSTALL_FLOPPY,v 1.38 2017/07/29 12:00:56 maxv Exp $ # # INSTALL - Installation kernel. # @@ -98,7 +98,6 @@ options COMPAT_70 # NetBSD 7.0 binary c #options COMPAT_386BSD_MBRPART # recognize old partition ID #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: maxv Date: Sat Jul 29 05:59:08 UTC 2017 Modified Files: src/sys/arch/i386/conf: XEN3_DOM0 XEN3_DOMU Log Message: Disable COMPAT_386BSD_MBRPART on Xen - not enabled in GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r1.78 -r1.79 src/sys/arch/i386/conf/XEN3_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/XEN3_DOM0 diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.114 src/sys/arch/i386/conf/XEN3_DOM0:1.115 --- src/sys/arch/i386/conf/XEN3_DOM0:1.114 Fri Jul 28 14:13:13 2017 +++ src/sys/arch/i386/conf/XEN3_DOM0 Sat Jul 29 05:59:08 2017 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.114 2017/07/28 14:13:13 maxv Exp $ +# $NetBSD: XEN3_DOM0,v 1.115 2017/07/29 05:59:08 maxv Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -93,7 +93,7 @@ options COMPAT_40 # NetBSD 4.0, options COMPAT_50 # NetBSD 5.0, options COMPAT_60 # NetBSD 6.0, and options COMPAT_70 # NetBSD 7.0 binary compatibility. -options COMPAT_386BSD_MBRPART # recognize old partition ID +#options COMPAT_386BSD_MBRPART # recognize old partition ID #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility Index: src/sys/arch/i386/conf/XEN3_DOMU diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.78 src/sys/arch/i386/conf/XEN3_DOMU:1.79 --- src/sys/arch/i386/conf/XEN3_DOMU:1.78 Fri Jul 28 14:13:13 2017 +++ src/sys/arch/i386/conf/XEN3_DOMU Sat Jul 29 05:59:08 2017 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.78 2017/07/28 14:13:13 maxv Exp $ +# $NetBSD: XEN3_DOMU,v 1.79 2017/07/29 05:59:08 maxv Exp $ include "arch/xen/conf/std.xen" @@ -77,7 +77,7 @@ options COMPAT_40 # NetBSD 4.0, options COMPAT_50 # NetBSD 5.0, options COMPAT_60 # NetBSD 6.0, and options COMPAT_70 # NetBSD 7.0 binary compatibility. -options COMPAT_386BSD_MBRPART # recognize old partition ID +#options COMPAT_386BSD_MBRPART # recognize old partition ID #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: maxv Date: Fri Jul 28 14:13:13 UTC 2017 Modified Files: src/sys/arch/i386/conf: GENERIC XEN3_DOM0 XEN3_DOMU Log Message: Disable svr4 and ibcs2 by default. These options are not well-tested, of a limited use case, and the potential for damage is too high. Vulnerabilities were presented at DEFCON 25 - I see that at least one of them can be exploited to get ring0 privileges. To generate a diff of this commit: cvs rdiff -u -r1.1158 -r1.1159 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.113 -r1.114 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r1.77 -r1.78 src/sys/arch/i386/conf/XEN3_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1158 src/sys/arch/i386/conf/GENERIC:1.1159 --- src/sys/arch/i386/conf/GENERIC:1.1158 Fri Jul 28 13:59:07 2017 +++ src/sys/arch/i386/conf/GENERIC Fri Jul 28 14:13:13 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1158 2017/07/28 13:59:07 maxv Exp $ +# $NetBSD: GENERIC,v 1.1159 2017/07/28 14:13:13 maxv Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1158 $" +#ident "GENERIC-$Revision: 1.1159 $" maxusers 64 # estimated number of users @@ -144,8 +144,8 @@ options COMPAT_43 # 4.3BSD, 386BSD, and #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility -options COMPAT_SVR4 # binary compatibility with SVR4 -options COMPAT_IBCS2 # binary compatibility with SCO and ISC +#options COMPAT_SVR4 # binary compatibility with SVR4 +#options COMPAT_IBCS2 # binary compatibility with SCO and ISC options COMPAT_LINUX # binary compatibility with Linux #options COMPAT_FREEBSD # binary compatibility with FreeBSD #options COMPAT_NDIS # NDIS network driver Index: src/sys/arch/i386/conf/XEN3_DOM0 diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.113 src/sys/arch/i386/conf/XEN3_DOM0:1.114 --- src/sys/arch/i386/conf/XEN3_DOM0:1.113 Thu Jun 22 18:14:32 2017 +++ src/sys/arch/i386/conf/XEN3_DOM0 Fri Jul 28 14:13:13 2017 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.113 2017/06/22 18:14:32 khorben Exp $ +# $NetBSD: XEN3_DOM0,v 1.114 2017/07/28 14:13:13 maxv Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -97,8 +97,8 @@ options COMPAT_386BSD_MBRPART # recogni #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility -options COMPAT_SVR4 # binary compatibility with SVR4 -options COMPAT_IBCS2 # binary compatibility with SCO and ISC +#options COMPAT_SVR4 # binary compatibility with SVR4 +#options COMPAT_IBCS2 # binary compatibility with SCO and ISC options COMPAT_LINUX # binary compatibility with Linux #options COMPAT_FREEBSD # binary compatibility with FreeBSD options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. Index: src/sys/arch/i386/conf/XEN3_DOMU diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.77 src/sys/arch/i386/conf/XEN3_DOMU:1.78 --- src/sys/arch/i386/conf/XEN3_DOMU:1.77 Sun May 21 06:19:37 2017 +++ src/sys/arch/i386/conf/XEN3_DOMU Fri Jul 28 14:13:13 2017 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.77 2017/05/21 06:19:37 pgoyette Exp $ +# $NetBSD: XEN3_DOMU,v 1.78 2017/07/28 14:13:13 maxv Exp $ include "arch/xen/conf/std.xen" @@ -81,8 +81,8 @@ options COMPAT_386BSD_MBRPART # recogni #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility -options COMPAT_SVR4 # binary compatibility with SVR4 -options COMPAT_IBCS2 # binary compatibility with SCO and ISC +#options COMPAT_SVR4 # binary compatibility with SVR4 +#options COMPAT_IBCS2 # binary compatibility with SCO and ISC options COMPAT_LINUX # binary compatibility with Linux #options COMPAT_FREEBSD # binary compatibility with FreeBSD options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: maxv Date: Fri Jul 28 13:59:07 UTC 2017 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: Disable vm86 by default. The use case is limited, and the potential for damage is too high. This code is fragile, and relies on a certain number of assumptions, some of which are not be totally true. For example, it relies on the fact that a 16bit process cannot perform a syscall, but verily it can. The slighest confusion in the trap frame can lead to ring0 exploits. Also, I'm not convinced that it interacts well with the compatibility layers. To generate a diff of this commit: cvs rdiff -u -r1.1157 -r1.1158 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1157 src/sys/arch/i386/conf/GENERIC:1.1158 --- src/sys/arch/i386/conf/GENERIC:1.1157 Wed Jul 12 17:40:34 2017 +++ src/sys/arch/i386/conf/GENERIC Fri Jul 28 13:59:07 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1157 2017/07/12 17:40:34 maxv Exp $ +# $NetBSD: GENERIC,v 1.1158 2017/07/28 13:59:07 maxv Exp $ # # GENERIC machine description file # @@ -22,12 +22,12 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1157 $" +#ident "GENERIC-$Revision: 1.1158 $" maxusers 64 # estimated number of users # CPU-related options. -options VM86 # virtual 8086 emulation +#options VM86 # virtual 8086 emulation options USER_LDT # user-settable LDT; used by WINE #options PAE # PAE mode (36 bits physical addressing)
CVS commit: src/sys/arch/i386/conf
Module Name:src
Committed By: bouyer
Date: Sun Jun 25 20:22:32 UTC 2017
Modified Files:
src/sys/arch/i386/conf: kern.ldscript.Xen
Log Message:
Restore alignement of _end to rev 1.12: this is where the Xen loader
puts the symbol table and should not be changed (maybe we should change
this symbol name).
keep kernel_end PAGE-aligned.
Makes ddb work again on Xen/i386
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/i386/conf/kern.ldscript.Xen
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/kern.ldscript.Xen
diff -u src/sys/arch/i386/conf/kern.ldscript.Xen:1.13 src/sys/arch/i386/conf/kern.ldscript.Xen:1.14
--- src/sys/arch/i386/conf/kern.ldscript.Xen:1.13 Tue Aug 2 14:03:34 2016
+++ src/sys/arch/i386/conf/kern.ldscript.Xen Sun Jun 25 20:22:32 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.Xen,v 1.13 2016/08/02 14:03:34 maxv Exp $ */
+/* $NetBSD: kern.ldscript.Xen,v 1.14 2017/06/25 20:22:32 bouyer Exp $ */
#include "assym.h"
@@ -54,14 +54,15 @@ SECTIONS
*(COMMON)
. = ALIGN(32 / 8);
}
+ . = ALIGN(32 / 8);
+ _end = . ;
+ PROVIDE (end = .) ;
. = ALIGN(__PAGE_SIZE);
/* End of the kernel image */
__kernel_end = . ;
- _end = . ;
- PROVIDE (end = .) ;
.note.netbsd.ident :
{
KEEP(*(.note.netbsd.ident));
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: christos Date: Mon Jan 23 17:36:17 UTC 2017 Modified Files: src/sys/arch/i386/conf: XEN3_DOM0 XEN3_DOMU Log Message: PR/51908: Kyle Amon: Allow customization of XEN kernels via .local files. To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r1.71 -r1.72 src/sys/arch/i386/conf/XEN3_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/XEN3_DOM0 diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.105 src/sys/arch/i386/conf/XEN3_DOM0:1.106 --- src/sys/arch/i386/conf/XEN3_DOM0:1.105 Thu Jan 12 00:24:36 2017 +++ src/sys/arch/i386/conf/XEN3_DOM0 Mon Jan 23 12:36:16 2017 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.105 2017/01/12 05:24:36 ryo Exp $ +# $NetBSD: XEN3_DOM0,v 1.106 2017/01/23 17:36:16 christos Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -774,6 +774,7 @@ hifn* at pci? dev ? function ? # Hifn 77 ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x cinclude "arch/i386/conf/GENERIC.local" +cinclude "arch/i386/conf/XEN3_DOM0.local" # Pseudo-Devices Index: src/sys/arch/i386/conf/XEN3_DOMU diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.71 src/sys/arch/i386/conf/XEN3_DOMU:1.72 --- src/sys/arch/i386/conf/XEN3_DOMU:1.71 Thu Jan 12 00:24:36 2017 +++ src/sys/arch/i386/conf/XEN3_DOMU Mon Jan 23 12:36:16 2017 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.71 2017/01/12 05:24:36 ryo Exp $ +# $NetBSD: XEN3_DOMU,v 1.72 2017/01/23 17:36:16 christos Exp $ include "arch/xen/conf/std.xen" @@ -197,6 +197,7 @@ xbd* at xenbus? # Xen virtual block de balloon* at xenbus? # Xen balloon device cinclude "arch/i386/conf/GENERIC.local" +cinclude "arch/i386/conf/XEN3_DOMU.local" # Pseudo-Devices
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: flxd Date: Sat Jan 7 11:21:05 UTC 2017 Modified Files: src/sys/arch/i386/conf: GENERIC_TINY Log Message: Add wsmux so wsconsctl will not fail when -f is not specified (and default control devices are used), as in /etc/rc.d/wscons. Kernel size increase is < 4 kB. To generate a diff of this commit: cvs rdiff -u -r1.146 -r1.147 src/sys/arch/i386/conf/GENERIC_TINY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC_TINY diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.146 src/sys/arch/i386/conf/GENERIC_TINY:1.147 --- src/sys/arch/i386/conf/GENERIC_TINY:1.146 Tue Dec 13 20:42:18 2016 +++ src/sys/arch/i386/conf/GENERIC_TINY Sat Jan 7 11:21:05 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_TINY,v 1.146 2016/12/13 20:42:18 christos Exp $ +# $NetBSD: GENERIC_TINY,v 1.147 2017/01/07 11:21:05 flxd Exp $ # # GENERIC_TINY -- suitable default for 4M machines # No EISA, PCI, or SCSI. @@ -555,3 +555,6 @@ pseudo-device tun # network tunneling pseudo-device pty # pseudo-terminals #options RND_COM # use "com" randomness as well (BROKEN) pseudo-device clockctl # user control of clock subsystem + +# wscons pseudo-devices +pseudo-device wsmux # mouse & keyboard multiplexor
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: christos Date: Fri Dec 9 02:24:17 UTC 2016 Modified Files: src/sys/arch/i386/conf: ALL GENERIC GENERIC_TINY INSTALL_FLOPPY INSTALL_TINY Log Message: PCPPISPEAKER To generate a diff of this commit: cvs rdiff -u -r1.404 -r1.405 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1142 -r1.1143 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.143 -r1.144 src/sys/arch/i386/conf/GENERIC_TINY cvs rdiff -u -r1.31 -r1.32 src/sys/arch/i386/conf/INSTALL_FLOPPY cvs rdiff -u -r1.145 -r1.146 src/sys/arch/i386/conf/INSTALL_TINY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.404 src/sys/arch/i386/conf/ALL:1.405 --- src/sys/arch/i386/conf/ALL:1.404 Thu Dec 8 06:31:10 2016 +++ src/sys/arch/i386/conf/ALL Thu Dec 8 21:24:17 2016 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.404 2016/12/08 11:31:10 nat Exp $ +# $NetBSD: ALL,v 1.405 2016/12/09 02:24:17 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.404 $" +#ident "ALL-$Revision: 1.405 $" maxusers 64 # estimated number of users @@ -1543,7 +1543,6 @@ midi* at midibus? midi* at pcppi? # MIDI interface to the PC speaker # The spkr driver provides a simple tone interface to the built in speaker. -options PCPPISPEAKER spkr0 at pcppi? # PC speaker #options VAUDIOSPEAKER Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1142 src/sys/arch/i386/conf/GENERIC:1.1143 --- src/sys/arch/i386/conf/GENERIC:1.1142 Thu Dec 8 06:31:10 2016 +++ src/sys/arch/i386/conf/GENERIC Thu Dec 8 21:24:17 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1142 2016/12/08 11:31:10 nat Exp $ +# $NetBSD: GENERIC,v 1.1143 2016/12/09 02:24:17 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1142 $" +#ident "GENERIC-$Revision: 1.1143 $" maxusers 64 # estimated number of users @@ -1466,7 +1466,6 @@ midi* at midibus? midi* at pcppi? # MIDI interface to the PC speaker # The spkr driver provides a simple tone interface to the built in speaker. -#options PCPPISPEAKER #spkr0 at pcppi? # PC speaker #options VAUDIOSPEAKER Index: src/sys/arch/i386/conf/GENERIC_TINY diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.143 src/sys/arch/i386/conf/GENERIC_TINY:1.144 --- src/sys/arch/i386/conf/GENERIC_TINY:1.143 Thu Dec 8 06:31:10 2016 +++ src/sys/arch/i386/conf/GENERIC_TINY Thu Dec 8 21:24:17 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_TINY,v 1.143 2016/12/08 11:31:10 nat Exp $ +# $NetBSD: GENERIC_TINY,v 1.144 2016/12/09 02:24:17 christos Exp $ # # GENERIC_TINY -- suitable default for 4M machines # No EISA, PCI, or SCSI. @@ -508,7 +508,6 @@ we1 at isa? port 0x300 iomem 0xcc000 irq #audio* at audiobus? # The spkr driver provides a simple tone interface to the built in speaker. -#options PCPPISPEAKER #spkr0 at pcppi? # PC speaker #options VAUDIOSPEAKER Index: src/sys/arch/i386/conf/INSTALL_FLOPPY diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.31 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.32 --- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.31 Thu Dec 8 06:31:10 2016 +++ src/sys/arch/i386/conf/INSTALL_FLOPPY Thu Dec 8 21:24:17 2016 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_FLOPPY,v 1.31 2016/12/08 11:31:10 nat Exp $ +# $NetBSD: INSTALL_FLOPPY,v 1.32 2016/12/09 02:24:17 christos Exp $ # # INSTALL - Installation kernel. # @@ -710,7 +710,6 @@ url* at uhub? port ? # Realtek RTL8150L #midi* at pcppi? # MIDI interface to the PC speaker # The spkr driver provides a simple tone interface to the built in speaker. -#options PCPPISPEAKER #spkr0 at pcppi? # PC speaker #options VAUDIOSPEAKER Index: src/sys/arch/i386/conf/INSTALL_TINY diff -u src/sys/arch/i386/conf/INSTALL_TINY:1.145 src/sys/arch/i386/conf/INSTALL_TINY:1.146 --- src/sys/arch/i386/conf/INSTALL_TINY:1.145 Thu Dec 8 06:31:11 2016 +++ src/sys/arch/i386/conf/INSTALL_TINY Thu Dec 8 21:24:17 2016 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_TINY,v 1.145 2016/12/08 11:31:11 nat Exp $ +# $NetBSD: INSTALL_TINY,v 1.146 2016/12/09 02:24:17 christos Exp $ # # This kernel should be derived from INSTALL (which is derived # from GENERIC) with some features commented out. @@ -468,7 +468,6 @@ we1 at isa? port 0x300 iomem 0xcc000 irq #audio* at audiobus? # The spkr driver provides a simple tone interface to the built in speaker. -#options PCPPISPEAKER #spkr0 at pcppi? # PC speaker #options VAUDIOSPEAKER
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jdolecek Date: Sat Sep 17 18:37:46 UTC 2016 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: add nvme(4) To generate a diff of this commit: cvs rdiff -u -r1.1139 -r1.1140 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1139 src/sys/arch/i386/conf/GENERIC:1.1140 --- src/sys/arch/i386/conf/GENERIC:1.1139 Sun Aug 7 10:44:05 2016 +++ src/sys/arch/i386/conf/GENERIC Sat Sep 17 18:37:46 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1139 2016/08/07 10:44:05 christos Exp $ +# $NetBSD: GENERIC,v 1.1140 2016/09/17 18:37:46 jdolecek Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1139 $" +#ident "GENERIC-$Revision: 1.1140 $" maxusers 64 # estimated number of users @@ -835,6 +835,9 @@ ses* at scsibus? target ? lun ? # SCSI E ss* at scsibus? target ? lun ? # SCSI scanners uk* at scsibus? target ? lun ? # SCSI unknown +# NVM Express controllers and devices +nvme* at pci? dev ? function ? +ld* at nvme? nsid ? # RAID controllers and devices aac* at pci? dev ? function ? # Adaptec AAC family
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jdolecek Date: Thu Sep 15 20:03:36 UTC 2016 Modified Files: src/sys/arch/i386/conf: MODULAR Log Message: COMPAT_FREEBSD was dropped from GENERIC in rev. 1.1125, no need to disable in MODULAR any more To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/i386/conf/MODULAR Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/MODULAR diff -u src/sys/arch/i386/conf/MODULAR:1.2 src/sys/arch/i386/conf/MODULAR:1.3 --- src/sys/arch/i386/conf/MODULAR:1.2 Sat Mar 10 21:51:53 2012 +++ src/sys/arch/i386/conf/MODULAR Thu Sep 15 20:03:36 2016 @@ -1,4 +1,4 @@ -# $NetBSD: MODULAR,v 1.2 2012/03/10 21:51:53 joerg Exp $ +# $NetBSD: MODULAR,v 1.3 2016/09/15 20:03:36 jdolecek Exp $ # # MODULAR kernel # This kernel config prefers loading kernel drivers from file system. @@ -18,7 +18,6 @@ no options COMPAT_OSSAUDIO # OSS (Voxwa no options COMPAT_SVR4 # binary compatibility with SVR4 no options COMPAT_IBCS2 # binary compatibility with SCO and ISC no options COMPAT_LINUX # binary compatibility with Linux -no options COMPAT_FREEBSD # binary compatibility with FreeBSD # build non boot critical file systems as modules #
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: msaitoh Date: Mon Jul 11 11:26:46 UTC 2016 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Add tcpcib, gpioiic, gpiopwm and bwi into i386/conf/ALL. To generate a diff of this commit: cvs rdiff -u -r1.398 -r1.399 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.398 src/sys/arch/i386/conf/ALL:1.399 --- src/sys/arch/i386/conf/ALL:1.398 Wed May 11 02:09:10 2016 +++ src/sys/arch/i386/conf/ALL Mon Jul 11 11:26:46 2016 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.398 2016/05/11 02:09:10 riastradh Exp $ +# $NetBSD: ALL,v 1.399 2016/07/11 11:26:46 msaitoh 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.398 $" +#ident "ALL-$Revision: 1.399 $" maxusers 64 # estimated number of users @@ -488,6 +488,8 @@ ichlpcib* at pci? dev ? function ? # Int hpet0 at ichlpcib? # High Precision Event Timer fwhrng* at ichlpcib? # Intel 82802 FWH Random Number Generator tco* at ichlpcib? # TCO watchdog timer +tcpcib* at pci? dev ? function ? # Intel Atom E6xx PCI-LPC +hpet* at tcpcib? gcscpcib* at pci? dev ? function ? # AMD CS5535/CS5536 PCI-ISA w/ gpio* at gcscpcib? # timecounter, watchdog and GPIO piixpcib* at pci? dev ? function ? # Intel PIIX4 PCI-ISA w/ SpeedStep @@ -788,9 +790,17 @@ onewire* at gpioow? # 1-Wire devices owtemp* at onewire? # Temperature sensors +# i2c support +gpioiic* at gpio? offset ? mask ? flag 0x00 # flag 0x01 reverses + # SCA and SCL signals +iic* at gpioiic? + # Keylock support gpiolock* at gpio? +# Software pulsing GPIO pins +gpiopwm* at gpio? + # Soekris 6501 GPIO/LED driver (provides gpiobus, needs gpio) soekrisgpio0 at isa? port 0x680 @@ -1145,6 +1155,7 @@ we1 at isa? port 0x300 iomem 0xcc000 irq ath* at cardbus? function ? # Atheros 5210/5211/5212 802.11 athn* at cardbus? function ? # Atheros AR9k (802.11a/g/n) atw* at cardbus? function ? # ADMtek ADM8211 (802.11) +bwi* at cardbus? function ? # Broadcom BCM43xx wireless ex* at cardbus? function ? # 3Com 3c575TX fxp* at cardbus? function ? # Intel i8255x ral* at cardbus? function ? # Ralink Technology RT25x0 802.11a/b/g
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: christos Date: Fri May 20 01:37:47 UTC 2016 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: Turn on PaX ASLR/MPROTECT To generate a diff of this commit: cvs rdiff -u -r1.1135 -r1.1136 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1135 src/sys/arch/i386/conf/GENERIC:1.1136 --- src/sys/arch/i386/conf/GENERIC:1.1135 Sat Apr 23 06:15:29 2016 +++ src/sys/arch/i386/conf/GENERIC Thu May 19 21:37:47 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1135 2016/04/23 10:15:29 skrll Exp $ +# $NetBSD: GENERIC,v 1.1136 2016/05/20 01:37:47 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1135 $" +#ident "GENERIC-$Revision: 1.1136 $" maxusers 64 # estimated number of users @@ -1713,5 +1713,8 @@ options VERIFIED_EXEC_FP_SHA512 options VERIFIED_EXEC_FP_SHA1 options VERIFIED_EXEC_FP_MD5 -options PAX_MPROTECT=0 # PaX mprotect(2) restrictions -options PAX_ASLR=0 # PaX Address Space Layout Randomization +options PAX_ASLR_DEBUG=1 # PaX ASLR debug +options PAX_SEGVGUARD=0 # PaX Segmentation fault guard +options PAX_MPROTECT=1 # PaX mprotect(2) restrictions +options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug +options PAX_ASLR=1 # PaX Address Space Layout Randomization
CVS commit: src/sys/arch/i386/conf
Module Name:src
Committed By: maxv
Date: Mon May 16 07:52:31 UTC 2016
Modified Files:
src/sys/arch/i386/conf: kern.ldscript.4MB
Log Message:
Update kern.ldscript.4MB. It is the same as kern.ldscript, but with a large
page alignment before rodata.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/i386/conf/kern.ldscript.4MB
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/kern.ldscript.4MB
diff -u src/sys/arch/i386/conf/kern.ldscript.4MB:1.16 src/sys/arch/i386/conf/kern.ldscript.4MB:1.17
--- src/sys/arch/i386/conf/kern.ldscript.4MB:1.16 Tue Aug 25 12:56:58 2015
+++ src/sys/arch/i386/conf/kern.ldscript.4MB Mon May 16 07:52:31 2016
@@ -1,69 +1,88 @@
-/* $NetBSD: kern.ldscript.4MB,v 1.16 2015/08/25 12:56:58 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript.4MB,v 1.17 2016/05/16 07:52:31 maxv Exp $ */
#include "assym.h"
+/*
+ * The large page size is 4MB in the non-PAE case.
+ */
+
+__PAGE_SIZE = 0x1000 ;
+__LARGE_PAGE_SIZE = 0x40 ;
+
ENTRY(_start)
SECTIONS
{
- /* Read-only sections, merged into text segment: */
- .text :
- {
-*(.text)
-*(.text.*)
-*(.stub)
- }
- _etext = . ;
- PROVIDE (etext = .) ;
-
- .rodata :
- {
-*(.rodata)
-*(.rodata.*)
- }
-
- /* Adjust the address for the data segment. We push the data segment
- up to the next 4MB boundary so that we can map the text with large
- pages. */
- . = ALIGN(0x40);
- __data_start = . ;
- .data :
- {
-*(.data)
- }
- . = ALIGN(COHERENCY_UNIT);
- .data.cacheline_aligned :
- {
-*(.data.cacheline_aligned)
- }
- . = ALIGN(COHERENCY_UNIT);
- .data.read_mostly :
- {
-*(.data.read_mostly)
- }
- . = ALIGN(COHERENCY_UNIT);
- _edata = . ;
- PROVIDE (edata = .) ;
- __bss_start = . ;
- .bss :
- {
-*(.bss)
-*(.bss.*)
-*(COMMON)
-. = ALIGN(32 / 8);
- }
- . = ALIGN(32 / 8);
- _end = . ;
- PROVIDE (end = .) ;
- .note.netbsd.ident :
- {
-KEEP(*(.note.netbsd.ident));
- }
+ .text :
+ {
+ *(.text)
+ *(.text.*)
+ *(.stub)
+ }
+ _etext = . ;
+ PROVIDE (etext = .) ;
+
+ /*
+ * Push the rodata segment up to the next large page boundary so that we
+ * can map the text segment with large pages.
+ */
+ . = ALIGN(__LARGE_PAGE_SIZE);
+
+ __rodata_start = . ;
+ .rodata :
+ {
+ *(.rodata)
+ *(.rodata.*)
+ }
+
+ . = ALIGN(__PAGE_SIZE);
+
+ __data_start = . ;
+ .data :
+ {
+ *(.data)
+ }
+
+ . = ALIGN(COHERENCY_UNIT);
+ .data.cacheline_aligned :
+ {
+ *(.data.cacheline_aligned)
+ }
+ . = ALIGN(COHERENCY_UNIT);
+ .data.read_mostly :
+ {
+ *(.data.read_mostly)
+ }
+ . = ALIGN(COHERENCY_UNIT);
+
+ _edata = . ;
+ PROVIDE (edata = .) ;
+ __bss_start = . ;
+ .bss :
+ {
+ *(.bss)
+ *(.bss.*)
+ *(COMMON)
+ . = ALIGN(32 / 8);
+ }
+
+ . = ALIGN(__PAGE_SIZE);
+
+ /* End of the kernel image */
+ __kernel_end = . ;
+
+ _end = . ;
+ PROVIDE (end = .) ;
+ .note.netbsd.ident :
+ {
+ KEEP(*(.note.netbsd.ident));
+ }
}
+
SECTIONS
{
- .text :
- AT (ADDR(.text) & 0x0fff)
- {
-*(.text)
- } =0
+ .text :
+ AT (ADDR(.text) & 0x0fff)
+ {
+ *(.text)
+ } = 0
}
CVS commit: src/sys/arch/i386/conf
Module Name:src
Committed By: maxv
Date: Sat May 14 08:19:42 UTC 2016
Modified Files:
src/sys/arch/i386/conf: kern.ldscript
Log Message:
Align the segments on i386. We're going to map them independently.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/i386/conf/kern.ldscript
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/kern.ldscript
diff -u src/sys/arch/i386/conf/kern.ldscript:1.18 src/sys/arch/i386/conf/kern.ldscript:1.19
--- src/sys/arch/i386/conf/kern.ldscript:1.18 Fri May 13 10:18:01 2016
+++ src/sys/arch/i386/conf/kern.ldscript Sat May 14 08:19:42 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.18 2016/05/13 10:18:01 maxv Exp $ */
+/* $NetBSD: kern.ldscript,v 1.19 2016/05/14 08:19:42 maxv Exp $ */
#include "assym.h"
@@ -16,11 +16,7 @@ SECTIONS
_etext = . ;
PROVIDE (etext = .) ;
- /*
- * Adjust the address for the rodata segment. We want to adjust up to
- * the same address within the page on the next page up.
- */
- . = ALIGN(0x1000) + (. & (0x1000 - 1));
+ . = ALIGN(__PAGE_SIZE);
__rodata_start = . ;
.rodata :
@@ -29,6 +25,8 @@ SECTIONS
*(.rodata.*)
}
+ . = ALIGN(__PAGE_SIZE);
+
__data_start = . ;
.data :
{
@@ -55,7 +53,7 @@ SECTIONS
*(.bss)
*(.bss.*)
*(COMMON)
- . = ALIGN(32 / 8);
+ . = ALIGN(32 / 8);
}
. = ALIGN(__PAGE_SIZE);
CVS commit: src/sys/arch/i386/conf
Module Name:src
Committed By: maxv
Date: Fri May 13 10:18:02 UTC 2016
Modified Files:
src/sys/arch/i386/conf: kern.ldscript
Log Message:
Define __kernel_end.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/conf/kern.ldscript
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/kern.ldscript
diff -u src/sys/arch/i386/conf/kern.ldscript:1.17 src/sys/arch/i386/conf/kern.ldscript:1.18
--- src/sys/arch/i386/conf/kern.ldscript:1.17 Thu May 12 06:45:16 2016
+++ src/sys/arch/i386/conf/kern.ldscript Fri May 13 10:18:01 2016
@@ -1,11 +1,12 @@
-/* $NetBSD: kern.ldscript,v 1.17 2016/05/12 06:45:16 maxv Exp $ */
+/* $NetBSD: kern.ldscript,v 1.18 2016/05/13 10:18:01 maxv Exp $ */
#include "assym.h"
+__PAGE_SIZE = 0x1000 ;
+
ENTRY(_start)
SECTIONS
{
- /* Read-only sections, merged into text segment: */
.text :
{
*(.text)
@@ -45,6 +46,7 @@ SECTIONS
*(.data.read_mostly)
}
. = ALIGN(COHERENCY_UNIT);
+
_edata = . ;
PROVIDE (edata = .) ;
__bss_start = . ;
@@ -55,7 +57,12 @@ SECTIONS
*(COMMON)
. = ALIGN(32 / 8);
}
- . = ALIGN(32 / 8);
+
+ . = ALIGN(__PAGE_SIZE);
+
+ /* End of the kernel image */
+ __kernel_end = . ;
+
_end = . ;
PROVIDE (end = .) ;
.note.netbsd.ident :
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: riastradh Date: Wed May 11 02:09:10 UTC 2016 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Enable nouveau in i386/ALL. Omit incorrect option NV_DEBUG. NV_DEBUG does not appear except as a macro function in nouveau, which is broken by defining it on the command line. >From coypu. To generate a diff of this commit: cvs rdiff -u -r1.397 -r1.398 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.397 src/sys/arch/i386/conf/ALL:1.398 --- src/sys/arch/i386/conf/ALL:1.397 Sun Oct 25 22:48:23 2015 +++ src/sys/arch/i386/conf/ALL Wed May 11 02:09:10 2016 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.397 2015/10/25 22:48:23 khorben Exp $ +# $NetBSD: ALL,v 1.398 2016/05/11 02:09:10 riastradh 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.397 $" +#ident "ALL-$Revision: 1.398 $" maxusers 64 # estimated number of users @@ -610,8 +610,8 @@ intelfb* at intelfbbus? radeon* at pci? dev ? function ? radeondrmkmsfb* at radeonfbbus? -#nouveau* at pci? dev ? function ? -#nouveaufb* at nouveaufbbus +nouveau* at pci? dev ? function ? +nouveaufb* at nouveaufbbus? # DRMUMS drivers viadrmums* at drm? @@ -2253,7 +2253,6 @@ options NOTDEF_DEBUG options NOT_DEBUG options NSIODEBUG options NTFS_DEBUG -options NV_DEBUG options OBOE_DEBUG options OFW_DEBUG options OHCI_DEBUG
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: mrg Date: Sun Mar 27 05:14:14 UTC 2016 Added Files: src/sys/arch/i386/conf: GENERIC_PAE Log Message: add a normal kernel that builds with PAE enabled. this is not yet hooked into the normal build, but this is a working configuration and on my 16GB test system, works fine. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/i386/conf/GENERIC_PAE Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/i386/conf/GENERIC_PAE diff -u /dev/null src/sys/arch/i386/conf/GENERIC_PAE:1.1 --- /dev/null Sun Mar 27 05:14:14 2016 +++ src/sys/arch/i386/conf/GENERIC_PAE Sun Mar 27 05:14:14 2016 @@ -0,0 +1,5 @@ +# $NetBSD: GENERIC_PAE,v 1.1 2016/03/27 05:14:14 mrg Exp $ + +include "arch/i386/conf/GENERIC" + +options PAE # PAE mode (36 bits physical addressing)
CVS commit: src/sys/arch/i386/conf
Module Name:src
Committed By: maxv
Date: Sat Nov 28 18:08:40 UTC 2015
Modified Files:
src/sys/arch/i386/conf: kern.ldscript
Log Message:
KNF
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/i386/conf/kern.ldscript
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/kern.ldscript
diff -u src/sys/arch/i386/conf/kern.ldscript:1.15 src/sys/arch/i386/conf/kern.ldscript:1.16
--- src/sys/arch/i386/conf/kern.ldscript:1.15 Tue Aug 25 12:56:58 2015
+++ src/sys/arch/i386/conf/kern.ldscript Sat Nov 28 18:08:40 2015
@@ -1,68 +1,72 @@
-/* $NetBSD: kern.ldscript,v 1.15 2015/08/25 12:56:58 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.16 2015/11/28 18:08:40 maxv Exp $ */
#include "assym.h"
ENTRY(_start)
SECTIONS
{
- /* Read-only sections, merged into text segment: */
- .text :
- {
-*(.text)
-*(.text.*)
-*(.stub)
- }
- _etext = . ;
- PROVIDE (etext = .) ;
-
- .rodata :
- {
-*(.rodata)
-*(.rodata.*)
- }
-
- /* Adjust the address for the data segment. We want to adjust up to
- the same address within the page on the next page up. */
- . = ALIGN(0x1000) + (. & (0x1000 - 1));
- __data_start = . ;
- .data :
- {
-*(.data)
- }
- . = ALIGN(COHERENCY_UNIT);
- .data.cacheline_aligned :
- {
-*(.data.cacheline_aligned)
- }
- . = ALIGN(COHERENCY_UNIT);
- .data.read_mostly :
- {
-*(.data.read_mostly)
- }
- . = ALIGN(COHERENCY_UNIT);
- _edata = . ;
- PROVIDE (edata = .) ;
- __bss_start = . ;
- .bss :
- {
-*(.bss)
-*(.bss.*)
-*(COMMON)
-. = ALIGN(32 / 8);
- }
- . = ALIGN(32 / 8);
- _end = . ;
- PROVIDE (end = .) ;
- .note.netbsd.ident :
- {
-KEEP(*(.note.netbsd.ident));
- }
+ /* Read-only sections, merged into text segment: */
+ .text :
+ {
+ *(.text)
+ *(.text.*)
+ *(.stub)
+ }
+ _etext = . ;
+ PROVIDE (etext = .) ;
+
+ .rodata :
+ {
+ *(.rodata)
+ *(.rodata.*)
+ }
+
+ /*
+ * Adjust the address for the data segment. We want to adjust up to
+ * the same address within the page on the next page up.
+ */
+ . = ALIGN(0x1000) + (. & (0x1000 - 1));
+ __data_start = . ;
+ .data :
+ {
+ *(.data)
+ }
+
+ . = ALIGN(COHERENCY_UNIT);
+ .data.cacheline_aligned :
+ {
+ *(.data.cacheline_aligned)
+ }
+ . = ALIGN(COHERENCY_UNIT);
+ .data.read_mostly :
+ {
+ *(.data.read_mostly)
+ }
+ . = ALIGN(COHERENCY_UNIT);
+ _edata = . ;
+ PROVIDE (edata = .) ;
+ __bss_start = . ;
+ .bss :
+ {
+ *(.bss)
+ *(.bss.*)
+ *(COMMON)
+ . = ALIGN(32 / 8);
+ }
+ . = ALIGN(32 / 8);
+ _end = . ;
+ PROVIDE (end = .) ;
+ .note.netbsd.ident :
+ {
+ KEEP(*(.note.netbsd.ident));
+ }
}
+
SECTIONS
{
- .text :
- AT (ADDR(.text) & 0x0fff)
- {
-*(.text)
- } =0
+ .text :
+ AT (ADDR(.text) & 0x0fff)
+ {
+ *(.text)
+ } = 0
}
CVS commit: src/sys/arch/i386/conf
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 11:42:57 UTC 2015
Modified Files:
src/sys/arch/i386/conf: stand.ldscript
Log Message:
Do AT () relocation once.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/i386/conf/stand.ldscript
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/stand.ldscript
diff -u src/sys/arch/i386/conf/stand.ldscript:1.2 src/sys/arch/i386/conf/stand.ldscript:1.3
--- src/sys/arch/i386/conf/stand.ldscript:1.2 Thu Aug 20 07:00:48 2015
+++ src/sys/arch/i386/conf/stand.ldscript Thu Aug 20 11:42:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: stand.ldscript,v 1.2 2015/08/20 07:00:48 uebayasi Exp $ */
+/* $NetBSD: stand.ldscript,v 1.3 2015/08/20 11:42:56 uebayasi Exp $ */
OUTPUT_FORMAT("elf32-i386", "elf32-i386",
"elf32-i386")
@@ -8,17 +8,15 @@ SECTIONS
{
/* Read-only sections, merged into text segment: */
.text :
- AT (ADDR(.text) & 0x0fff)
{
*(.text)
*(.text.*)
*(.stub)
- } =0
+ }
_etext = . ;
PROVIDE (etext = .) ;
.rodata :
- AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text)))
{
*(.rodata)
*(.rodata.*)
@@ -26,17 +24,14 @@ SECTIONS
__data_start = . ;
.data :
- AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
{
*(.data)
}
.data.cacheline_aligned :
- AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
{
*(.data.cacheline_aligned)
}
.data.read_mostly :
- AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
{
*(.data.read_mostly)
}
@@ -44,7 +39,6 @@ SECTIONS
PROVIDE (edata = .) ;
__bss_start = . ;
.bss :
- AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
{
*(.bss)
*(.bss.*)
@@ -62,3 +56,11 @@ SECTIONS
*(.note.netbsd.ident)
}
}
+SECTIONS
+{
+ .text :
+ AT (ADDR(.text) & 0x0fff)
+ {
+*(.text)
+ } =0
+}
CVS commit: src/sys/arch/i386/conf
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 09:34:54 UTC 2015
Modified Files:
src/sys/arch/i386/conf: kern.ldscript kern.ldscript.4MB
kern.ldscript.Xen
Log Message:
Simplify these by doing AT () relocation once.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/conf/kern.ldscript
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/i386/conf/kern.ldscript.4MB
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/conf/kern.ldscript.Xen
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/kern.ldscript
diff -u src/sys/arch/i386/conf/kern.ldscript:1.12 src/sys/arch/i386/conf/kern.ldscript:1.13
--- src/sys/arch/i386/conf/kern.ldscript:1.12 Thu Aug 20 07:00:48 2015
+++ src/sys/arch/i386/conf/kern.ldscript Thu Aug 20 09:34:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.12 2015/08/20 07:00:48 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.13 2015/08/20 09:34:54 uebayasi Exp $ */
OUTPUT_FORMAT("elf32-i386", "elf32-i386",
"elf32-i386")
@@ -8,17 +8,15 @@ SECTIONS
{
/* Read-only sections, merged into text segment: */
.text :
- AT (ADDR(.text) & 0x0fff)
{
*(.text)
*(.text.*)
*(.stub)
- } =0
+ }
_etext = . ;
PROVIDE (etext = .) ;
.rodata :
- AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text)))
{
*(.rodata)
*(.rodata.*)
@@ -29,19 +27,16 @@ SECTIONS
. = ALIGN(0x1000) + (. & (0x1000 - 1));
__data_start = . ;
.data :
- AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
{
*(.data)
}
. = ALIGN(64); /* COHERENCY_UNIT */
.data.cacheline_aligned :
- AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
{
*(.data.cacheline_aligned)
}
. = ALIGN(64); /* COHERENCY_UNIT */
.data.read_mostly :
- AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
{
*(.data.read_mostly)
}
@@ -50,7 +45,6 @@ SECTIONS
PROVIDE (edata = .) ;
__bss_start = . ;
.bss :
- AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
{
*(.bss)
*(.bss.*)
@@ -65,3 +59,11 @@ SECTIONS
KEEP(*(.note.netbsd.ident));
}
}
+SECTIONS
+{
+ .text :
+ AT (ADDR(.text) & 0x0fff)
+ {
+*(.text)
+ } =0
+}
Index: src/sys/arch/i386/conf/kern.ldscript.4MB
diff -u src/sys/arch/i386/conf/kern.ldscript.4MB:1.13 src/sys/arch/i386/conf/kern.ldscript.4MB:1.14
--- src/sys/arch/i386/conf/kern.ldscript.4MB:1.13 Thu Aug 20 07:00:48 2015
+++ src/sys/arch/i386/conf/kern.ldscript.4MB Thu Aug 20 09:34:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.4MB,v 1.13 2015/08/20 07:00:48 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript.4MB,v 1.14 2015/08/20 09:34:54 uebayasi Exp $ */
OUTPUT_FORMAT("elf32-i386", "elf32-i386",
"elf32-i386")
@@ -8,17 +8,15 @@ SECTIONS
{
/* Read-only sections, merged into text segment: */
.text :
- AT (ADDR(.text) & 0x0fff)
{
*(.text)
*(.text.*)
*(.stub)
- } =0
+ }
_etext = . ;
PROVIDE (etext = .) ;
.rodata :
- AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text)))
{
*(.rodata)
*(.rodata.*)
@@ -30,19 +28,16 @@ SECTIONS
. = ALIGN(0x40);
__data_start = . ;
.data :
- AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
{
*(.data)
}
. = ALIGN(64); /* COHERENCY_UNIT */
.data.cacheline_aligned :
- AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
{
*(.data.cacheline_aligned)
}
. = ALIGN(64); /* COHERENCY_UNIT */
.data.read_mostly :
- AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
{
*(.data.read_mostly)
}
@@ -51,7 +46,6 @@ SECTIONS
PROVIDE (edata = .) ;
__bss_start = . ;
.bss :
- AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
{
*(.bss)
*(.bss.*)
@@ -66,3 +60,11 @@ SECTIONS
KEEP(*(.note.netbsd.ident));
}
}
+SECTIONS
+{
+ .text :
+ AT (ADDR(.text) & 0x0fff)
+ {
+*(.text)
+ } =0
+}
Index: src/sys/arch/i386/conf/kern.ldscript.Xen
diff -u src/sys/arch/i386/conf/kern.ldscript.Xen:1.7 src/sys/arch/i386/conf/kern.ldscript.Xen:1.8
--- src/sys/arch/i386/conf/kern.ldscript.Xen:1.7 Thu Aug 20 07:00:48 2015
+++ src/sys/arch/i386/conf/kern.ldscript.Xen Thu Aug 20 09:34:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.Xen,v 1.7 2015/08/20 07:00:48 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript.Xen,v 1.8 2015/08/20 09:34:54 uebayasi Exp $ */
OUTPUT_FORMAT("elf32-i386", "elf32-i386",
"elf32-i386")
@@ -11,7 +11,7 @@ SECTIONS
*(.text)
*(.text.*)
*(.stub)
- } =0
+ }
_etext = . ;
PROVIDE (etext = .) ;
@@ -31,13 +31,11 @@ SECTIONS
}
. = ALIGN(64); /* COHERENCY_UNIT */
.data.cacheline_aligned :
- AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
{
*(.data.cacheline_aligned)
}
. = ALIGN(64); /* COHERENCY_UNIT */
.data.read_mostly :
- AT (LOADADDR(.text) + (ADDR(.data.re
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: maxv Date: Sat May 23 18:13:31 UTC 2015 Modified Files: src/sys/arch/i386/conf: GENERIC XEN3_DOM0 XEN3_DOMU Log Message: Disable COMPAT_FREEBSD. The implementation is poor, not well tested and almost irrelevant. People who need it (for tw_cli for example) can still recompile their kernels with this option. Discussed on tech-kern@ To generate a diff of this commit: cvs rdiff -u -r1.1124 -r1.1125 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.94 -r1.95 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r1.66 -r1.67 src/sys/arch/i386/conf/XEN3_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1124 src/sys/arch/i386/conf/GENERIC:1.1125 --- src/sys/arch/i386/conf/GENERIC:1.1124 Mon May 4 07:08:10 2015 +++ src/sys/arch/i386/conf/GENERIC Sat May 23 18:13:31 2015 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1124 2015/05/04 07:08:10 pgoyette Exp $ +# $NetBSD: GENERIC,v 1.1125 2015/05/23 18:13:31 maxv Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1124 $" +#ident "GENERIC-$Revision: 1.1125 $" maxusers 64 # estimated number of users @@ -149,7 +149,7 @@ options COMPAT_OSSAUDIO # OSS (Voxware) options COMPAT_SVR4 # binary compatibility with SVR4 options COMPAT_IBCS2 # binary compatibility with SCO and ISC options COMPAT_LINUX # binary compatibility with Linux -options COMPAT_FREEBSD # binary compatibility with FreeBSD +#options COMPAT_FREEBSD # binary compatibility with FreeBSD #options COMPAT_NDIS # NDIS network driver options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. Index: src/sys/arch/i386/conf/XEN3_DOM0 diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.94 src/sys/arch/i386/conf/XEN3_DOM0:1.95 --- src/sys/arch/i386/conf/XEN3_DOM0:1.94 Tue Feb 17 09:21:57 2015 +++ src/sys/arch/i386/conf/XEN3_DOM0 Sat May 23 18:13:31 2015 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.94 2015/02/17 09:21:57 nonaka Exp $ +# $NetBSD: XEN3_DOM0,v 1.95 2015/05/23 18:13:31 maxv Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -98,7 +98,7 @@ options COMPAT_OSSAUDIO # OSS (Voxware) options COMPAT_SVR4 # binary compatibility with SVR4 options COMPAT_IBCS2 # binary compatibility with SCO and ISC options COMPAT_LINUX # binary compatibility with Linux -options COMPAT_FREEBSD # binary compatibility with FreeBSD +#options COMPAT_FREEBSD # binary compatibility with FreeBSD options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. # Wedge support Index: src/sys/arch/i386/conf/XEN3_DOMU diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.66 src/sys/arch/i386/conf/XEN3_DOMU:1.67 --- src/sys/arch/i386/conf/XEN3_DOMU:1.66 Tue May 5 22:14:24 2015 +++ src/sys/arch/i386/conf/XEN3_DOMU Sat May 23 18:13:31 2015 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.66 2015/05/05 22:14:24 pgoyette Exp $ +# $NetBSD: XEN3_DOMU,v 1.67 2015/05/23 18:13:31 maxv Exp $ include "arch/xen/conf/std.xen" @@ -84,7 +84,7 @@ options COMPAT_OSSAUDIO # OSS (Voxware) options COMPAT_SVR4 # binary compatibility with SVR4 options COMPAT_IBCS2 # binary compatibility with SCO and ISC options COMPAT_LINUX # binary compatibility with Linux -options COMPAT_FREEBSD # binary compatibility with FreeBSD +#options COMPAT_FREEBSD # binary compatibility with FreeBSD options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. # Wedge support
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: pgoyette Date: Mon May 4 07:08:10 UTC 2015 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: One more typo. Message to self: when making multi-architecture changes, build on more than one arch. To generate a diff of this commit: cvs rdiff -u -r1.1123 -r1.1124 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1123 src/sys/arch/i386/conf/GENERIC:1.1124 --- src/sys/arch/i386/conf/GENERIC:1.1123 Sun May 3 02:52:50 2015 +++ src/sys/arch/i386/conf/GENERIC Mon May 4 07:08:10 2015 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1123 2015/05/03 02:52:50 pgoyette Exp $ +# $NetBSD: GENERIC,v 1.1124 2015/05/04 07:08:10 pgoyette Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1123 $" +#ident "GENERIC-$Revision: 1.1124 $" maxusers 64 # estimated number of users @@ -454,7 +454,7 @@ ichlpcib* at pci? dev ? function ? # Int # watchdog, gpio, SpeedStep and HPET fwhrng* at ichlpcib? # Intel 82802 FWH Random Number Generator #hpet* at ichlpcib? -tco* at ichlpbib? # TCO watchdog timer +tco* at ichlpcib? # TCO watchdog timer tcpcib* at pci? dev ? function ? # Intel Atom E6xx PCI-LPC hpet* at tcpcib? gcscpcib* at pci? dev ? function ? # AMD CS5535/CS5536 PCI-ISA w/
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: riastradh Date: Wed Apr 29 17:43:06 UTC 2015 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: Add commented viadrmums to i386/GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.1121 -r1.1122 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1121 src/sys/arch/i386/conf/GENERIC:1.1122 --- src/sys/arch/i386/conf/GENERIC:1.1121 Wed Mar 18 02:05:05 2015 +++ src/sys/arch/i386/conf/GENERIC Wed Apr 29 17:43:06 2015 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1121 2015/03/18 02:05:05 snj Exp $ +# $NetBSD: GENERIC,v 1.1122 2015/04/29 17:43:06 riastradh Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1121 $" +#ident "GENERIC-$Revision: 1.1122 $" maxusers 64 # estimated number of users @@ -570,6 +570,7 @@ sysbeep0 at pcppi? #tdfxdrm* at drm? # 3dfx (voodoo) DRM driver #viadrm* at drm? # VIA DRM driver +# DRMKMS drivers i915drmkms* at pci? dev ? function ? intelfb* at intelfbbus? @@ -579,6 +580,9 @@ radeondrmkmsfb* at radeonfbbus? #nouveau* at pci? dev ? function ? #nouveaufb* at nouveaufbbus? +# DRMUMS drivers +#viadrmums* at drm? + # Serial Devices # PCI serial interfaces
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: snj Date: Wed Mar 18 02:05:05 UTC 2015 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: fix commented out nouveaufb To generate a diff of this commit: cvs rdiff -u -r1.1120 -r1.1121 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1120 src/sys/arch/i386/conf/GENERIC:1.1121 --- src/sys/arch/i386/conf/GENERIC:1.1120 Sat Mar 7 07:28:37 2015 +++ src/sys/arch/i386/conf/GENERIC Wed Mar 18 02:05:05 2015 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1120 2015/03/07 07:28:37 mrg Exp $ +# $NetBSD: GENERIC,v 1.1121 2015/03/18 02:05:05 snj Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1120 $" +#ident "GENERIC-$Revision: 1.1121 $" maxusers 64 # estimated number of users @@ -577,7 +577,7 @@ radeon* at pci? dev ? function ? radeondrmkmsfb* at radeonfbbus? #nouveau* at pci? dev ? function ? -#nouveaufb* at nouveaufbbus +#nouveaufb* at nouveaufbbus? # Serial Devices
CVS commit: src/sys/arch/i386/conf
Module Name:src
Committed By: uebayasi
Date: Sat Nov 15 12:26:44 UTC 2014
Modified Files:
src/sys/arch/i386/conf: Makefile.i386
Log Message:
Use LINKSCRIPT.
To generate a diff of this commit:
cvs rdiff -u -r1.182 -r1.183 src/sys/arch/i386/conf/Makefile.i386
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/Makefile.i386
diff -u src/sys/arch/i386/conf/Makefile.i386:1.182 src/sys/arch/i386/conf/Makefile.i386:1.183
--- src/sys/arch/i386/conf/Makefile.i386:1.182 Sat May 24 18:39:04 2014
+++ src/sys/arch/i386/conf/Makefile.i386 Sat Nov 15 12:26:44 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.i386,v 1.182 2014/05/24 18:39:04 jakllsch Exp $
+# $NetBSD: Makefile.i386,v 1.183 2014/11/15 12:26:44 uebayasi Exp $
# Makefile for NetBSD
#
@@ -78,7 +78,7 @@ lock_stubs.o: ${I386}/i386/lock_stubs.S
TEXTADDR?= c010
LINKFLAGS_NORMAL= -X
KERN_LDSCRIPT?= kern.ldscript
-LINKFORMAT= -T ${I386}/conf/${KERN_LDSCRIPT}
+LINKSCRIPT= -T ${I386}/conf/${KERN_LDSCRIPT}
##
## (6) port specific target dependencies
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: christos Date: Sun Nov 2 23:14:20 UTC 2014 Modified Files: src/sys/arch/i386/conf: ALL GENERIC INSTALL Removed Files: src/sys/arch/i386/conf: DRMKMS NO_DRM Log Message: switch to DRMKMS drivers To generate a diff of this commit: cvs rdiff -u -r1.387 -r1.388 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.6 -r0 src/sys/arch/i386/conf/DRMKMS cvs rdiff -u -r1.1115 -r1.1116 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.330 -r1.331 src/sys/arch/i386/conf/INSTALL cvs rdiff -u -r1.1 -r0 src/sys/arch/i386/conf/NO_DRM Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.387 src/sys/arch/i386/conf/ALL:1.388 --- src/sys/arch/i386/conf/ALL:1.387 Sat Oct 18 12:56:51 2014 +++ src/sys/arch/i386/conf/ALL Sun Nov 2 18:14:20 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.387 2014/10/18 16:56:51 uebayasi Exp $ +# $NetBSD: ALL,v 1.388 2014/11/02 23:14: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.387 $" +#ident "ALL-$Revision: 1.388 $" maxusers 64 # estimated number of users @@ -592,17 +592,26 @@ voodoofb* at pci? dev ? function ? wcfb* at pci? dev ? function ? wsdisplay* at wsemuldisplaydev? -# DRI driver -i915drm* at drm? # Intel i915, i945 DRM driver -mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver -mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver -r128drm* at drm? # ATI Rage 128 DRM driver -radeondrm* at drm? # ATI Radeon DRM driver -savagedrm* at drm? # S3 Savage DRM driver -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 +# DRI legacy drivers +#i915drm* at drm? # Intel i915, i945 DRM driver +#mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver +#mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver +#r128drm* at drm? # ATI Rage 128 DRM driver +#radeondrm* at drm? # ATI Radeon DRM driver +#savagedrm* at drm? # S3 Savage DRM driver +#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 + +i915drmkms* at pci? dev ? function ? +intelfb* at intelfbbus? + +radeon* at pci? dev ? function ? +radeondrmkmsfb* at radeonfbbus? + +#nouveau* at pci? dev ? function ? +#nouveaufb* at nouveaufbbus attimer0 at isa? pcppi0 at isa? Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1115 src/sys/arch/i386/conf/GENERIC:1.1116 --- src/sys/arch/i386/conf/GENERIC:1.1115 Sat Oct 18 12:56:51 2014 +++ src/sys/arch/i386/conf/GENERIC Sun Nov 2 18:14:20 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1115 2014/10/18 16:56:51 uebayasi Exp $ +# $NetBSD: GENERIC,v 1.1116 2014/11/02 23:14:20 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1115 $" +#ident "GENERIC-$Revision: 1.1116 $" maxusers 64 # estimated number of users @@ -557,16 +557,25 @@ attimer0 at isa? pcppi0 at isa? sysbeep0 at pcppi? -# DRI driver -i915drm* at drm? # Intel i915, i945 DRM driver -mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver -mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver -r128drm* at drm? # ATI Rage 128 DRM driver -radeondrm* at drm? # ATI Radeon DRM driver -savagedrm* at drm? # S3 Savage DRM driver -sisdrm* at drm? # SiS DRM driver -tdfxdrm* at drm? # 3dfx (voodoo) DRM driver -viadrm* at drm? # VIA DRM driver +# DRI legacy drivers +#i915drm* at drm? # Intel i915, i945 DRM driver +#mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver +#mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver +#r128drm* at drm? # ATI Rage 128 DRM driver +#radeondrm* at drm? # ATI Radeon DRM driver +#savagedrm* at drm? # S3 Savage DRM driver +#sisdrm* at drm? # SiS DRM driver +#tdfxdrm* at drm? # 3dfx (voodoo) DRM driver +#viadrm* at drm? # VIA DRM driver + +i915drmkms* at pci? dev ? function ? +intelfb* at intelfbbus? + +radeon* at pci? dev ? function ? +radeondrmkmsfb* at radeonfbbus? + +#nouveau* at pci? dev ? function ? +#nouveaufb* at nouveaufbbus # Serial Devices Index: src/sys/arch/i386/conf/INSTALL diff -u src/sys/arch/i386/conf/INSTALL:1.330 src/sys/arch/i386/conf/INSTALL:1.331 --- src/sys/arch/i386/conf/INSTALL:1.330 Sat May 28 09:01:50 2011 +++ src/sys/arch/i386/conf/INSTALL Sun Nov 2 18:14:20 2014 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.330 2011/05/28 13:01:50 ryo Exp $ +# $NetBSD: INSTALL,v 1.331 2014/11/02 23:14:2
CVS commit: src/sys/arch/i386/conf
Module Name:src
Committed By: dholland
Date: Sat Aug 23 21:10:20 UTC 2014
Modified Files:
src/sys/arch/i386/conf: INSTALL_FLOPPY INSTALL_TINY NET4501
Log Message:
Add missing COMPAT_{50,60,70} lines, commented out or not as per the
COMPAT_40 line.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/i386/conf/INSTALL_FLOPPY
cvs rdiff -u -r1.142 -r1.143 src/sys/arch/i386/conf/INSTALL_TINY
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/i386/conf/NET4501
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/INSTALL_FLOPPY
diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.25 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.26
--- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.25 Sat Aug 23 20:26:58 2014
+++ src/sys/arch/i386/conf/INSTALL_FLOPPY Sat Aug 23 21:10:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_FLOPPY,v 1.25 2014/08/23 20:26:58 dholland Exp $
+# $NetBSD: INSTALL_FLOPPY,v 1.26 2014/08/23 21:10:20 dholland Exp $
#
# INSTALL - Installation kernel.
#
@@ -88,8 +88,11 @@ options DDB # in-kernel debugger
#options COMPAT_15 # NetBSD 1.5,
#options COMPAT_16 # NetBSD 1.6,
options COMPAT_20 # NetBSD 2.0,
-options COMPAT_30 # NetBSD 3.0, and
-options COMPAT_40 # NetBSD 4.0 binary compatibility.
+options COMPAT_30 # NetBSD 3.0,
+options COMPAT_40 # NetBSD 4.0,
+options COMPAT_50 # NetBSD 5.0,
+options COMPAT_60 # NetBSD 6.0, and
+options COMPAT_70 # NetBSD 7.0 binary compatibility.
#options COMPAT_43 # 4.3BSD, 386BSD, and BSDI
#options COMPAT_386BSD_MBRPART # recognize old partition ID
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
Index: src/sys/arch/i386/conf/INSTALL_TINY
diff -u src/sys/arch/i386/conf/INSTALL_TINY:1.142 src/sys/arch/i386/conf/INSTALL_TINY:1.143
--- src/sys/arch/i386/conf/INSTALL_TINY:1.142 Sat Aug 23 20:26:58 2014
+++ src/sys/arch/i386/conf/INSTALL_TINY Sat Aug 23 21:10:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_TINY,v 1.142 2014/08/23 20:26:58 dholland Exp $
+# $NetBSD: INSTALL_TINY,v 1.143 2014/08/23 21:10:20 dholland Exp $
#
# This kernel should be derived from INSTALL (which is derived
# from GENERIC) with some features commented out.
@@ -77,8 +77,11 @@ no options EXEC_AOUT # we don't a.out s
#options COMPAT_15 # NetBSD 1.5,
#options COMPAT_16 # NetBSD 1.6,
#options COMPAT_20 # NetBSD 2.0,
-#options COMPAT_30 # NetBSD 3.0, and
-#options COMPAT_40 # NetBSD 4.0 binary compatibility.
+#options COMPAT_30 # NetBSD 3.0,
+#options COMPAT_40 # NetBSD 4.0,
+#options COMPAT_50 # NetBSD 5.0,
+#options COMPAT_60 # NetBSD 6.0, and
+#options COMPAT_70 # NetBSD 7.0 binary compatibility.
#options COMPAT_43 # 4.3BSD, 386BSD, and BSDI compatibility.
#options COMPAT_386BSD_MBRPART # recognize old partition ID
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
Index: src/sys/arch/i386/conf/NET4501
diff -u src/sys/arch/i386/conf/NET4501:1.86 src/sys/arch/i386/conf/NET4501:1.87
--- src/sys/arch/i386/conf/NET4501:1.86 Sat Aug 23 20:26:58 2014
+++ src/sys/arch/i386/conf/NET4501 Sat Aug 23 21:10:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: NET4501,v 1.86 2014/08/23 20:26:58 dholland Exp $
+# $NetBSD: NET4501,v 1.87 2014/08/23 21:10:20 dholland Exp $
#
# NET4501 -- kernel configuration for a Soekris Engineering net4501
# single-board computer.
@@ -10,7 +10,7 @@ include "arch/i386/conf/std.i386"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "NET4501-$Revision: 1.86 $"
+#ident "NET4501-$Revision: 1.87 $"
maxusers 32 # estimated number of users
@@ -87,8 +87,11 @@ options COMPAT_14 # NetBSD 1.4,
options COMPAT_15 # NetBSD 1.5,
options COMPAT_16 # NetBSD 1.6,
options COMPAT_20 # NetBSD 2.0,
-options COMPAT_30 # NetBSD 3.0, and
-options COMPAT_40 # NetBSD 4.0 binary compatibility.
+options COMPAT_30 # NetBSD 3.0,
+options COMPAT_40 # NetBSD 4.0,
+options COMPAT_50 # NetBSD 5.0,
+options COMPAT_60 # NetBSD 6.0, and
+options COMPAT_70 # NetBSD 7.0 binary compatibility.
options COMPAT_43 # 4.3BSD, 386BSD, and BSDI compatibility.
options COMPAT_386BSD_MBRPART # recognize old partition ID
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: riastradh Date: Fri Jul 25 11:51:21 UTC 2014 Modified Files: src/sys/arch/i386/conf: DRMKMS Log Message: Add intelfb to i386/DRMKMS too. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/i386/conf/DRMKMS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/DRMKMS diff -u src/sys/arch/i386/conf/DRMKMS:1.2 src/sys/arch/i386/conf/DRMKMS:1.3 --- src/sys/arch/i386/conf/DRMKMS:1.2 Fri Jul 18 16:01:07 2014 +++ src/sys/arch/i386/conf/DRMKMS Fri Jul 25 11:51:21 2014 @@ -1,6 +1,7 @@ include "arch/i386/conf/NO_DRM" i915drmkms* at pci? dev ? function ? +intelfb* at intelfbbus? no options DIAGNOSTIC options DIAGNOSTIC # expensive kernel consistency check
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: prlw1 Date: Fri Jul 18 16:01:08 UTC 2014 Modified Files: src/sys/arch/i386/conf: DRMKMS Log Message: drmkmsbus has gone away To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/i386/conf/DRMKMS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/DRMKMS diff -u src/sys/arch/i386/conf/DRMKMS:1.1 src/sys/arch/i386/conf/DRMKMS:1.2 --- src/sys/arch/i386/conf/DRMKMS:1.1 Thu Apr 3 19:18:51 2014 +++ src/sys/arch/i386/conf/DRMKMS Fri Jul 18 16:01:07 2014 @@ -1,6 +1,5 @@ include "arch/i386/conf/NO_DRM" -drmkms* at drmkmsbus? i915drmkms* at pci? dev ? function ? no options DIAGNOSTIC
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: christos Date: Thu May 29 14:48:40 UTC 2014 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: enable IPSEC To generate a diff of this commit: cvs rdiff -u -r1.1103 -r1.1104 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1103 src/sys/arch/i386/conf/GENERIC:1.1104 --- src/sys/arch/i386/conf/GENERIC:1.1103 Mon Apr 21 12:35:38 2014 +++ src/sys/arch/i386/conf/GENERIC Thu May 29 10:48:40 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1103 2014/04/21 16:35:38 chs Exp $ +# $NetBSD: GENERIC,v 1.1104 2014/05/29 14:48:40 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1103 $" +#ident "GENERIC-$Revision: 1.1104 $" maxusers 64 # estimated number of users @@ -199,7 +199,7 @@ options NFSSERVER # Network File System #options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP options INET6 # IPv6 -#options IPSEC # IP security +options IPSEC # IP security #options IPSEC_DEBUG # debug for IP security #options MPLS # MultiProtocol Label Switching (needs ifmpls) #options MROUTING # IP multicast routing
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: christos Date: Tue Apr 8 19:40:57 UTC 2014 Modified Files: src/sys/arch/i386/conf: ALL GENERIC Log Message: add ixg To generate a diff of this commit: cvs rdiff -u -r1.370 -r1.371 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1101 -r1.1102 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.370 src/sys/arch/i386/conf/ALL:1.371 --- src/sys/arch/i386/conf/ALL:1.370 Mon Mar 24 10:15:38 2014 +++ src/sys/arch/i386/conf/ALL Tue Apr 8 15:40:57 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.370 2014/03/24 14:15:38 szptvlfn Exp $ +# $NetBSD: ALL,v 1.371 2014/04/08 19:40:57 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.370 $" +#ident "ALL-$Revision: 1.371 $" maxusers 64 # estimated number of users @@ -1017,6 +1017,7 @@ hme* at pci? dev ? function ? # Sun Micr ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100 iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN +ixg* at pci? dev ? function ? # Intel 8259x 10 gigabit 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 Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1101 src/sys/arch/i386/conf/GENERIC:1.1102 --- src/sys/arch/i386/conf/GENERIC:1.1101 Mon Mar 24 10:15:38 2014 +++ src/sys/arch/i386/conf/GENERIC Tue Apr 8 15:40:57 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1101 2014/03/24 14:15:38 szptvlfn Exp $ +# $NetBSD: GENERIC,v 1.1102 2014/04/08 19:40:57 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1101 $" +#ident "GENERIC-$Revision: 1.1102 $" maxusers 64 # estimated number of users @@ -962,6 +962,7 @@ hme* at pci? dev ? function ? # Sun Micr ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100 iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN +ixg* at pci? dev ? function ? # Intel 8259x 10 gigabit 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
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: riastradh Date: Thu Apr 3 19:18:51 UTC 2014 Added Files: src/sys/arch/i386/conf: DRMKMS NO_DRM Log Message: Copy NO_DRM and DRMKMS kernels for i386. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/i386/conf/DRMKMS \ src/sys/arch/i386/conf/NO_DRM Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/i386/conf/DRMKMS diff -u /dev/null src/sys/arch/i386/conf/DRMKMS:1.1 --- /dev/null Thu Apr 3 19:18:51 2014 +++ src/sys/arch/i386/conf/DRMKMS Thu Apr 3 19:18:51 2014 @@ -0,0 +1,10 @@ +include "arch/i386/conf/NO_DRM" + +drmkms* at drmkmsbus? +i915drmkms* at pci? dev ? function ? + +no options DIAGNOSTIC +options DIAGNOSTIC # expensive kernel consistency check +options DEBUG # expensive debugging checks/support +options LOCKDEBUG # debug locks +makeoptions DEBUG="-g" # compile full symbol table Index: src/sys/arch/i386/conf/NO_DRM diff -u /dev/null src/sys/arch/i386/conf/NO_DRM:1.1 --- /dev/null Thu Apr 3 19:18:51 2014 +++ src/sys/arch/i386/conf/NO_DRM Thu Apr 3 19:18:51 2014 @@ -0,0 +1,11 @@ +include "arch/i386/conf/GENERIC" + +no i915drm* at drm? +no mach64drm* at drm? +no mgadrm* at drm? +no r128drm* at drm? +no radeondrm* at drm? +no savagedrm* at drm? +no sisdrm* at drm? +no tdfxdrm* at drm? +no viadrm* at drm?
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: martin Date: Sun Mar 16 09:35:05 UTC 2014 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Add umcs(4) To generate a diff of this commit: cvs rdiff -u -r1.367 -r1.368 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.367 src/sys/arch/i386/conf/ALL:1.368 --- src/sys/arch/i386/conf/ALL:1.367 Sun Jan 26 19:16:16 2014 +++ src/sys/arch/i386/conf/ALL Sun Mar 16 09:35:05 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.367 2014/01/26 19:16:16 dsl Exp $ +# $NetBSD: ALL,v 1.368 2014/03/16 09:35:05 martin 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.367 $" +#ident "ALL-$Revision: 1.368 $" maxusers 64 # estimated number of users @@ -1342,6 +1342,9 @@ ucom* at uark? portno ? moscom* at uhub? port ? ucom* at moscom? portno ? +umcs* at uhub? port ? # Moschip MCS7xxx serial adapter +ucom* at umcs? portno ? + uhmodem* at uhub? ucom* at uhmodem? portno ?
CVS commit: src/sys/arch/i386/conf
Module Name:src
Committed By: joerg
Date: Fri Feb 7 00:25:45 UTC 2014
Modified Files:
src/sys/arch/i386/conf: Makefile.i386
Log Message:
Like amd64, use -msoft-float.
To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 src/sys/arch/i386/conf/Makefile.i386
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/Makefile.i386
diff -u src/sys/arch/i386/conf/Makefile.i386:1.180 src/sys/arch/i386/conf/Makefile.i386:1.181
--- src/sys/arch/i386/conf/Makefile.i386:1.180 Wed Feb 5 18:52:22 2014
+++ src/sys/arch/i386/conf/Makefile.i386 Fri Feb 7 00:25:45 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.i386,v 1.180 2014/02/05 18:52:22 dsl Exp $
+# $NetBSD: Makefile.i386,v 1.181 2014/02/07 00:25:45 joerg Exp $
# Makefile for NetBSD
#
@@ -34,7 +34,7 @@ GENASSYM_CONF= ${I386}/i386/genassym.cf
## (2) compile settings
##
CPPFLAGS+= -Di386
-CFLAGS+=-mno-80387 -mno-fp-ret-in-387
+CFLAGS+= -msoft-float
## no-sse implies no-sse2 but not no-avx
CFLAGS+= -mno-mmx -mno-sse -mno-avx
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: riz Date: Sat Nov 23 23:36:34 UTC 2013 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Add RAID_DIAGNOSTIC so that code gets built. ok oster@ To generate a diff of this commit: cvs rdiff -u -r1.365 -r1.366 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.365 src/sys/arch/i386/conf/ALL:1.366 --- src/sys/arch/i386/conf/ALL:1.365 Fri Nov 22 18:58:01 2013 +++ src/sys/arch/i386/conf/ALL Sat Nov 23 23:36:34 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.365 2013/11/22 18:58:01 riz Exp $ +# $NetBSD: ALL,v 1.366 2013/11/23 23:36:34 riz 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.365 $" +#ident "ALL-$Revision: 1.366 $" maxusers 64 # estimated number of users @@ -1675,6 +1675,7 @@ pseudo-device ccd # concatenated/strip pseudo-device cgd # cryptographic disk devices pseudo-device raid # RAIDframe disk driver options RAID_AUTOCONFIG # auto-configuration of RAID components +options RAID_DIAGNOSTIC # Additional raidframe diagnostic info # Options to enable various other RAIDframe RAID types. options RF_INCLUDE_EVENODD=1 options RF_INCLUDE_RAID5_RS=1
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: riz Date: Fri Nov 22 18:58:01 UTC 2013 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Comment out npf for now, as we can't have both NPF and PF in the same kernel - rmind has said he'll address this eventually, and for now PF is more likely to have unnoticed breakage. ALL now builds again! To generate a diff of this commit: cvs rdiff -u -r1.364 -r1.365 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.364 src/sys/arch/i386/conf/ALL:1.365 --- src/sys/arch/i386/conf/ALL:1.364 Sat Oct 26 09:16:20 2013 +++ src/sys/arch/i386/conf/ALL Fri Nov 22 18:58:01 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.364 2013/10/26 09:16:20 nonaka Exp $ +# $NetBSD: ALL,v 1.365 2013/11/22 18:58:01 riz 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.364 $" +#ident "ALL-$Revision: 1.365 $" maxusers 64 # estimated number of users @@ -1719,7 +1719,7 @@ pseudo-device agr # IEEE 802.3ad link pseudo-device pf # PF packet filter pseudo-device pflog # PF log if pseudo-device pfsync # PF sync if -pseudo-device npf # NPF packet filter +#pseudo-device npf # NPF packet filter pseudo-device kttcp pseudo-device etherip # EtherIP # srt is EXPERIMENTAL
CVS commit: src/sys/arch/i386/conf
Module Name:src
Committed By: christos
Date: Fri Nov 1 00:19:04 UTC 2013
Added Files:
src/sys/arch/i386/conf: stand.ldscript
Log Message:
provide an ldscript for booters that strips the unwind sections.
XXX: untested
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/i386/conf/stand.ldscript
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/arch/i386/conf/stand.ldscript
diff -u /dev/null src/sys/arch/i386/conf/stand.ldscript:1.1
--- /dev/null Thu Oct 31 20:19:04 2013
+++ src/sys/arch/i386/conf/stand.ldscript Thu Oct 31 20:19:04 2013
@@ -0,0 +1,64 @@
+/* $NetBSD: stand.ldscript,v 1.1 2013/11/01 00:19:04 christos Exp $ */
+
+OUTPUT_FORMAT("elf32-i386", "elf32-i386",
+ "elf32-i386")
+OUTPUT_ARCH(i386)
+ENTRY(_start)
+SECTIONS
+{
+ /* Read-only sections, merged into text segment: */
+ .text :
+ AT (ADDR(.text) & 0x0fff)
+ {
+ *(.text)
+ *(.text.*)
+ *(.stub)
+ } =0
+ _etext = . ;
+ PROVIDE (etext = .) ;
+
+ .rodata :
+ AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text)))
+ {
+ *(.rodata)
+ *(.rodata.*)
+ }
+
+ __data_start = . ;
+ .data :
+ AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
+ {
+ *(.data)
+ }
+ .data.cacheline_aligned :
+ AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
+ {
+ *(.data.cacheline_aligned)
+ }
+ .data.read_mostly :
+ AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
+ {
+ *(.data.read_mostly)
+ }
+ _edata = . ;
+ PROVIDE (edata = .) ;
+ __bss_start = . ;
+ .bss :
+ AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
+ {
+ *(.bss)
+ *(.bss.*)
+ *(COMMON)
+ . = ALIGN(32 / 8);
+ }
+ . = ALIGN(32 / 8);
+ _end = . ;
+ PROVIDE (end = .) ;
+ /DISCARD/ : {
+*(.eh_frame_hdr)
+*(.eh_frame)
+*(.rel.eh_frame)
+*(.rela.eh_frame)
+*(.note.netbsd.ident)
+ }
+}
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: matt Date: Wed Oct 23 17:26:08 UTC 2013 Modified Files: src/sys/arch/i386/conf: GENERIC XEN3_DOM0 Log Message: Add xhci device To generate a diff of this commit: cvs rdiff -u -r1.1096 -r1.1097 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.79 -r1.80 src/sys/arch/i386/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1096 src/sys/arch/i386/conf/GENERIC:1.1097 --- src/sys/arch/i386/conf/GENERIC:1.1096 Sun Jun 30 21:38:57 2013 +++ src/sys/arch/i386/conf/GENERIC Wed Oct 23 17:26:08 2013 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1096 2013/06/30 21:38:57 rmind Exp $ +# $NetBSD: GENERIC,v 1.1097 2013/10/23 17:26:08 matt Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1096 $" +#ident "GENERIC-$Revision: 1.1097 $" maxusers 64 # estimated number of users @@ -1128,6 +1128,7 @@ urlphy* at mii? phy ? # Realtek RTL815 # USB Controller and Devices # PCI USB controllers +xhci* at pci? dev ? function ? # eXtensible Host Controller ehci* at pci? dev ? function ? # Enhanced Host Controller gcscehci* at pci? dev ? function ? # Enhanced Host Controller (Geode CSC) ohci* at pci? dev ? function ? # Open Host Controller @@ -1145,6 +1146,7 @@ uhci* at cardbus? function ? # Universa slhci* at pcmcia? function ? # ScanLogic SL811HS # USB bus support +usb* at xhci? usb* at ehci? usb* at gcscehci? usb* at ohci? Index: src/sys/arch/i386/conf/XEN3_DOM0 diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.79 src/sys/arch/i386/conf/XEN3_DOM0:1.80 --- src/sys/arch/i386/conf/XEN3_DOM0:1.79 Sun Jun 30 21:38:57 2013 +++ src/sys/arch/i386/conf/XEN3_DOM0 Wed Oct 23 17:26:08 2013 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.79 2013/06/30 21:38:57 rmind Exp $ +# $NetBSD: XEN3_DOM0,v 1.80 2013/10/23 17:26:08 matt Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -522,11 +522,13 @@ wsmouse* at pms? mux 0 # USB Controller and Devices # PCI USB controllers +xhci* at pci? dev ? function ? # eXtensible Host Controller ehci* at pci? dev ? function ? # Enhanced Host Controller ohci* at pci? dev ? function ? # Open Host Controller uhci* at pci? dev ? function ? # Universal Host Controller (Intel) # USB bus support +usb* at xhci? usb* at ehci? usb* at ohci? usb* at uhci?
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jakllsch Date: Sat Sep 14 00:42:21 UTC 2013 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Add xhci(4). To generate a diff of this commit: cvs rdiff -u -r1.362 -r1.363 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.362 src/sys/arch/i386/conf/ALL:1.363 --- src/sys/arch/i386/conf/ALL:1.362 Sun Jun 30 21:38:57 2013 +++ src/sys/arch/i386/conf/ALL Sat Sep 14 00:42:21 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.362 2013/06/30 21:38:57 rmind Exp $ +# $NetBSD: ALL,v 1.363 2013/09/14 00:42:21 jakllsch 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.362 $" +#ident "ALL-$Revision: 1.363 $" maxusers 64 # estimated number of users @@ -1187,6 +1187,7 @@ ehci* at pci? dev ? function ? # Enhance gcscehci* at pci? dev ? function ? # Enhanced Host Controller (Geode CSC) ohci* at pci? dev ? function ? # Open Host Controller uhci* at pci? dev ? function ? # Universal Host Controller (Intel) +xhci* at pci? dev ? function ? # eXtensible Host Controller # CardBus USB controllers ehci* at cardbus? function ? # Enhanced Host Controller @@ -1205,6 +1206,7 @@ usb* at gcscehci? usb* at ohci? usb* at slhci? usb* at uhci? +usb* at xhci? # USB Hubs uhub* at usb?
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: dholland Date: Tue Jun 18 04:33:57 UTC 2013 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Add LFS_KERNEL_RFW, a preexisting lfs option that should have been here all along. To generate a diff of this commit: cvs rdiff -u -r1.360 -r1.361 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.360 src/sys/arch/i386/conf/ALL:1.361 --- src/sys/arch/i386/conf/ALL:1.360 Mon Jun 10 07:14:01 2013 +++ src/sys/arch/i386/conf/ALL Tue Jun 18 04:33:57 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.360 2013/06/10 07:14:01 kardel Exp $ +# $NetBSD: ALL,v 1.361 2013/06/18 04:33:57 dholland 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.360 $" +#ident "ALL-$Revision: 1.361 $" maxusers 64 # estimated number of users @@ -200,6 +200,7 @@ options FFS_EI # FFS Endian Independen options WAPBL # File system journaling support options UFS_DIRHASH # UFS Large Directory Hashing - Experimental options UFS_EXTATTR +options LFS_KERNEL_RFW options LFS_EI # LFS endian-independent support - experimental options LFS_DIRHASH # LFS version of UFS_DIRHASH - experimental options LFS_EXTATTR # extended attributes for LFS - experimental
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: dholland Date: Sat Jun 8 02:43:10 UTC 2013 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Add the new LFS options. To generate a diff of this commit: cvs rdiff -u -r1.358 -r1.359 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.358 src/sys/arch/i386/conf/ALL:1.359 --- src/sys/arch/i386/conf/ALL:1.358 Wed Jun 5 23:08:01 2013 +++ src/sys/arch/i386/conf/ALL Sat Jun 8 02:43:10 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.358 2013/06/05 23:08:01 christos Exp $ +# $NetBSD: ALL,v 1.359 2013/06/08 02:43:10 dholland 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.358 $" +#ident "ALL-$Revision: 1.359 $" maxusers 64 # estimated number of users @@ -200,6 +200,12 @@ options FFS_EI # FFS Endian Independen options WAPBL # File system journaling support options UFS_DIRHASH # UFS Large Directory Hashing - Experimental options UFS_EXTATTR +options LFS_EI # LFS endian-independent support - experimental +options LFS_DIRHASH # LFS version of UFS_DIRHASH - experimental +options LFS_EXTATTR # extended attributes for LFS - experimental +options LFS_EXTATTR_AUTOSTART # like UFS_EXTATTR_AUTOSTART +options LFS_QUOTA # quotas for LFS - experimental +options LFS_QUOTA2 # new-style quotas for LFS - experimental options NFSSERVER # Network File System server options FFS_NO_SNAPSHOT # No FFS snapshot support options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: riz Date: Wed Apr 17 00:11:41 UTC 2013 Modified Files: src/sys/arch/i386/conf: XEN3_DOMU Log Message: Sync DKWEDGE options with XEN3_DOM0. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/arch/i386/conf/XEN3_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/XEN3_DOMU diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.50 src/sys/arch/i386/conf/XEN3_DOMU:1.51 --- src/sys/arch/i386/conf/XEN3_DOMU:1.50 Sat Mar 2 02:42:15 2013 +++ src/sys/arch/i386/conf/XEN3_DOMU Wed Apr 17 00:11:40 2013 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.50 2013/03/02 02:42:15 christos Exp $ +# $NetBSD: XEN3_DOMU,v 1.51 2013/04/17 00:11:40 riz Exp $ include "arch/xen/conf/std.xen" @@ -86,6 +86,13 @@ options COMPAT_LINUX # binary compatibi options COMPAT_FREEBSD # binary compatibility with FreeBSD options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. +# Wedge support +options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances +options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges +# The following two options can break /etc/fstab, so handle with care +#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges +#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges + # File systems file-system FFS # UFS file-system EXT2FS # second extended file system (linux)
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: martin Date: Sat Apr 6 16:59:59 UTC 2013 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: Add athn To generate a diff of this commit: cvs rdiff -u -r1.1088 -r1.1089 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1088 src/sys/arch/i386/conf/GENERIC:1.1089 --- src/sys/arch/i386/conf/GENERIC:1.1088 Sat Mar 2 02:42:15 2013 +++ src/sys/arch/i386/conf/GENERIC Sat Apr 6 16:59:59 2013 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1088 2013/03/02 02:42:15 christos Exp $ +# $NetBSD: GENERIC,v 1.1089 2013/04/06 16:59:59 martin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1088 $" +#ident "GENERIC-$Revision: 1.1089 $" maxusers 64 # estimated number of users @@ -949,6 +949,7 @@ an* at pci? dev ? function ? # Aironet P alc* at pci? dev ? function ? # Attansic/Atheros L1C/L2C Ethernet ale* at pci? dev ? function ? # Attansic/Atheros L1E Ethernet ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11 +athn* at pci? dev ? function ? # Atheros AR9k (802.11a/g/n) atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11) bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet @@ -1067,6 +1068,7 @@ we1 at isa? port 0x300 iomem 0xcc000 irq # CardBus network cards ath* at cardbus? function ? # Atheros 5210/5211/5212 802.11 +athn* at cardbus? function ? # Atheros AR9k (802.11a/g/n) - UNTESTED atw* at cardbus? function ? # ADMtek ADM8211 (802.11) bwi* at cardbus? function ? # Broadcom BCM43xx wireless ex* at cardbus? function ? # 3Com 3c575TX @@ -1232,6 +1234,7 @@ url* at uhub? port ? # Realtek RTL8150L urndis* at uhub? port ? # Microsoft RNDIS specification # USB 802.11 adapters +athn* at uhub? port ? # Atheros AR9002U atu* at uhub? port ? # Atmel AT76C50XX based adapters otus* at uhub? port ? # Atheros AR9001U ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: martin Date: Sat Apr 6 16:57:33 UTC 2013 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Add athn To generate a diff of this commit: cvs rdiff -u -r1.352 -r1.353 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.352 src/sys/arch/i386/conf/ALL:1.353 --- src/sys/arch/i386/conf/ALL:1.352 Sat Mar 2 02:42:16 2013 +++ src/sys/arch/i386/conf/ALL Sat Apr 6 16:57:32 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.352 2013/03/02 02:42:16 christos Exp $ +# $NetBSD: ALL,v 1.353 2013/04/06 16:57:32 martin 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.352 $" +#ident "ALL-$Revision: 1.353 $" maxusers 64 # estimated number of users @@ -995,6 +995,7 @@ an* at pci? dev ? function ? # Aironet P alc* at pci? dev ? function ? # Attansic/Atheros L1C/L2C Ethernet ale* at pci? dev ? function ? # Attansic/Atheros L1E Ethernet ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11 +athn* at pci? dev ? function ? # Atheros AR9k (802.11a/g/n) atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11) bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet @@ -1116,6 +1117,7 @@ we1 at isa? port 0x300 iomem 0xcc000 irq # CardBus network cards ath* at cardbus? function ? # Atheros 5210/5211/5212 802.11 +athn* at cardbus? function ? # Atheros AR9k (802.11a/g/n) atw* at cardbus? function ? # ADMtek ADM8211 (802.11) ex* at cardbus? function ? # 3Com 3c575TX fxp* at cardbus? function ? # Intel i8255x @@ -1286,6 +1288,7 @@ urndis* at uhub? port ? # Microsoft RND # USB 802.11 adapters atu* at uhub? port ? # Atmel AT76C50XX based adapters +athn* at uhub? port ? # Atheros AR9002U otus* at uhub? port ? # Atheros AR9001U ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: skrll Date: Thu Dec 27 14:39:39 UTC 2012 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Add some usb devices. To generate a diff of this commit: cvs rdiff -u -r1.349 -r1.350 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.349 src/sys/arch/i386/conf/ALL:1.350 --- src/sys/arch/i386/conf/ALL:1.349 Mon Dec 17 20:38:00 2012 +++ src/sys/arch/i386/conf/ALL Thu Dec 27 14:39:39 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.349 2012/12/17 20:38:00 mbalmer Exp $ +# $NetBSD: ALL,v 1.350 2012/12/27 14:39:39 skrll 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.349 $" +#ident "ALL-$Revision: 1.350 $" maxusers 64 # estimated number of users @@ -1210,6 +1210,10 @@ uhidev* at uhub? port ? configuration ? ums* at uhidev? reportid ? wsmouse* at ums? mux 0 +# USB Touchscreens +uts* at uhidev? reportid ? +wsmouse* at uts? mux 0 + # USB eGalax touch-panel uep* at uhub? port ? wsmouse* at uep? mux 0 @@ -1235,6 +1239,7 @@ uhid* at uhidev? reportid ? # USB LCDs and USB-VGA adaptors udl* at uhub? port ? # DisplayLink DL-1x0/1x5 +wsdisplay* at udl? # USB Printer ulpt* at uhub? port ? configuration ? interface ? @@ -1287,13 +1292,19 @@ atu* at uhub? port ? # Atmel AT76C50XX otus* at uhub? port ? # Atheros AR9001U ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g +run* at uhub? port ? # Ralink Technology RT(2[78]|30)00 802.11a/b/g/n upgt* at uhub? port ? # Intersil PrismGT +urtw* at uhub? port ? # Realtek RTL8187/RTL8187B 802.11b/g +urtwn* at uhub? port ? # Realtek RTL8188CU/RTL8192CU 802.11b/g/n zyd* at uhub? port ? # Zydas ZD1211 # Prolific PL2301/PL2302 host-to-host adapter upl* at uhub? port ? # Serial adapters +uark* at uhub? port ? # ArkMicroChips 3116 serial adapter +ucom* at uark? portno? + ubsa* at uhub? port ? # Belkin serial adapter ucom* at ubsa? portno ?
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: mbalmer Date: Tue Dec 25 10:51:04 UTC 2012 Modified Files: src/sys/arch/i386/conf: GENERIC files.i386 Log Message: Whitespace fixes. To generate a diff of this commit: cvs rdiff -u -r1.1085 -r1.1086 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.369 -r1.370 src/sys/arch/i386/conf/files.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1085 src/sys/arch/i386/conf/GENERIC:1.1086 --- src/sys/arch/i386/conf/GENERIC:1.1085 Mon Dec 17 20:38:00 2012 +++ src/sys/arch/i386/conf/GENERIC Tue Dec 25 10:51:03 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1085 2012/12/17 20:38:00 mbalmer Exp $ +# $NetBSD: GENERIC,v 1.1086 2012/12/25 10:51:03 mbalmer Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1085 $" +#ident "GENERIC-$Revision: 1.1086 $" maxusers 64 # estimated number of users @@ -1530,8 +1530,8 @@ ubsec* at pci? dev ? function ? # Broadc # Trusted Platform Module tpm* at isa? iomem 0xfed4 irq 7 #tpm* at isa? port 0x02e -#tpm* at isa? port 0x04e -#tpm* at isa? port 0x07e +#tpm* at isa? port 0x04e +#tpm* at isa? port 0x07e #tpm* at isa? port 0x0ee # Joysticks Index: src/sys/arch/i386/conf/files.i386 diff -u src/sys/arch/i386/conf/files.i386:1.369 src/sys/arch/i386/conf/files.i386:1.370 --- src/sys/arch/i386/conf/files.i386:1.369 Sun Dec 16 13:09:20 2012 +++ src/sys/arch/i386/conf/files.i386 Tue Dec 25 10:51:03 2012 @@ -1,4 +1,4 @@ -# $NetBSD: files.i386,v 1.369 2012/12/16 13:09:20 mbalmer Exp $ +# $NetBSD: files.i386,v 1.370 2012/12/25 10:51:03 mbalmer Exp $ # # new style config file for i386 architecture # @@ -462,7 +462,7 @@ obsolete defflag opt_vesafb.h VESAFB_PM # AMD Geode LX Security Block device glxsb: opencrypto -attach glxsb at pci +attach glxsb at pci file arch/i386/pci/glxsb.c glxsb include "arch/i386/conf/majors.i386"
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: mbalmer Date: Sun Dec 16 18:52:18 UTC 2012 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Add ptcd(4). To generate a diff of this commit: cvs rdiff -u -r1.347 -r1.348 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.347 src/sys/arch/i386/conf/ALL:1.348 --- src/sys/arch/i386/conf/ALL:1.347 Wed Oct 17 14:48:13 2012 +++ src/sys/arch/i386/conf/ALL Sun Dec 16 18:52:17 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.347 2012/10/17 14:48:13 apb Exp $ +# $NetBSD: ALL,v 1.348 2012/12/16 18:52:17 mbalmer 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.347 $" +#ident "ALL-$Revision: 1.348 $" maxusers 64 # estimated number of users @@ -517,6 +517,10 @@ isa0 at mainbus? isa0 at pceb? isa0 at pcib? +# Protech PS3100 cash drawer port +ptcd0 at isa? +gpio* at ptcd? + # PCMCIA bus support pcmcia* at pcic? controller ? socket ? pcmcia* at tcic? controller ? socket ?
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: dholland Date: Mon Dec 10 02:03:45 UTC 2012 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: whitespace To generate a diff of this commit: cvs rdiff -u -r1.1083 -r1.1084 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1083 src/sys/arch/i386/conf/GENERIC:1.1084 --- src/sys/arch/i386/conf/GENERIC:1.1083 Wed Dec 5 16:19:46 2012 +++ src/sys/arch/i386/conf/GENERIC Mon Dec 10 02:03:45 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1083 2012/12/05 16:19:46 christos Exp $ +# $NetBSD: GENERIC,v 1.1084 2012/12/10 02:03:45 dholland Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1083 $" +#ident "GENERIC-$Revision: 1.1084 $" maxusers 64 # estimated number of users @@ -972,7 +972,7 @@ jme* at pci? dev ? function ? # JMicron 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 +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
CVS commit: src/sys/arch/i386/conf
Module Name:src
Committed By: dsl
Date: Mon Oct 1 17:35:58 UTC 2012
Modified Files:
src/sys/arch/i386/conf: Makefile.i386
Log Message:
apmcall.o no longer exists.
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/sys/arch/i386/conf/Makefile.i386
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/Makefile.i386
diff -u src/sys/arch/i386/conf/Makefile.i386:1.176 src/sys/arch/i386/conf/Makefile.i386:1.177
--- src/sys/arch/i386/conf/Makefile.i386:1.176 Mon Dec 19 14:06:16 2011
+++ src/sys/arch/i386/conf/Makefile.i386 Mon Oct 1 17:35:57 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.i386,v 1.176 2011/12/19 14:06:16 joerg Exp $
+# $NetBSD: Makefile.i386,v 1.177 2012/10/01 17:35:57 dsl Exp $
# Makefile for NetBSD
#
@@ -87,7 +87,7 @@ LINKFORMAT= -T ${I386}/conf/${KERN_LDSCR
freebsd_sigcode.o i386func.o ibcs2_sigcode.o linux_support.o: assym.h
linux_sigcode.o lock_stubs.o svr4_sigcode.o mach_sigcode.o: assym.h
-apmcall.o cpufunc.o cpu_in_cksum.o pnpbioscall.o bioscall.o: assym.h
+cpufunc.o cpu_in_cksum.o pnpbioscall.o bioscall.o: assym.h
mptramp.o: assym.h
acpi_wakeup_low.o busfunc.o kvm86call.o: assym.h
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: chs Date: Sun Sep 23 01:03:40 UTC 2012 Modified Files: src/sys/arch/i386/conf: ALL Log Message: add some more devices and options. To generate a diff of this commit: cvs rdiff -u -r1.343 -r1.344 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.343 src/sys/arch/i386/conf/ALL:1.344 --- src/sys/arch/i386/conf/ALL:1.343 Sat Sep 1 18:17:50 2012 +++ src/sys/arch/i386/conf/ALL Sun Sep 23 01:03:39 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.343 2012/09/01 18:17:50 jakllsch Exp $ +# $NetBSD: ALL,v 1.344 2012/09/23 01:03:39 chs 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.343 $" +#ident "ALL-$Revision: 1.344 $" maxusers 64 # estimated number of users @@ -125,6 +125,7 @@ makeoptions DEBUG="-g" # compile full sy options SYSCALL_STATS # per syscall counts options SYSCALL_TIMES # per syscall times options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris) +options KDTRACE_HOOKS # kernel DTrace hooks # Compatibility options options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI @@ -573,7 +574,8 @@ machfb* at pci? dev ? function ? pm2fb* at pci? dev ? function ? r128fb* at pci? dev ? function ? radeonfb* at pci? dev ? function ? -unichromefb* at pci? dev ? function ? # VIA Unichrome framebuffer console +tga* at pci? dev ? function ? # DEC ZLXp-E[123] Graphics +unichromefb* at pci? dev ? function ? # VIA Unichrome framebuffer console voodoofb* at pci? dev ? function ? wcfb* at pci? dev ? function ? wsdisplay* at wsemuldisplaydev? @@ -1003,6 +1005,7 @@ et* at pci? dev ? function ? # Agere/LSI ex* at pci? dev ? function ? # 3Com 3c90x[BC] fpa* at pci? dev ? function ? # DEC DEFPA FDDI fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B +gem* at pci? dev ? function ? # Apple GMAC and Sun ERI gigabit enet gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100 @@ -1657,9 +1660,6 @@ options VND_COMPRESSION # compressed v pseudo-device dm # device-mapper disk driver -# NPF -pseudo-device npf - # network pseudo-devices pseudo-device bpfilter # Berkeley packet filter pseudo-device carp # Common Address Redundancy Protocol @@ -1684,7 +1684,8 @@ options BRIDGE_IPF # bridge uses IP/IP pseudo-device agr # IEEE 802.3ad link aggregation pseudo-device pf # PF packet filter pseudo-device pflog # PF log if -pseudo-device pfsync +pseudo-device pfsync # PF sync if +pseudo-device npf # NPF packet filter pseudo-device kttcp pseudo-device etherip # EtherIP # srt is EXPERIMENTAL
CVS commit: src/sys/arch/i386/conf
Module Name:src
Committed By: chs
Date: Sun Sep 23 01:01:18 UTC 2012
Modified Files:
src/sys/arch/i386/conf: kern.ldscript kern.ldscript.4MB
kern.ldscript.Xen
Log Message:
sync ldscripts; add cacheline_aligned and read_mostly handling
to the non-default ones.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/conf/kern.ldscript
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/i386/conf/kern.ldscript.4MB
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/conf/kern.ldscript.Xen
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/kern.ldscript
diff -u src/sys/arch/i386/conf/kern.ldscript:1.8 src/sys/arch/i386/conf/kern.ldscript:1.9
--- src/sys/arch/i386/conf/kern.ldscript:1.8 Tue Jun 1 22:13:30 2010
+++ src/sys/arch/i386/conf/kern.ldscript Sun Sep 23 01:01:17 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.8 2010/06/01 22:13:30 mjf Exp $ */
+/* $NetBSD: kern.ldscript,v 1.9 2012/09/23 01:01:17 chs Exp $ */
OUTPUT_FORMAT("elf32-i386", "elf32-i386",
"elf32-i386")
@@ -23,7 +23,7 @@ SECTIONS
*(.rodata)
*(.rodata.*)
}
-
+
/* Adjust the address for the data segment. We want to adjust up to
the same address within the page on the next page up. */
. = ALIGN(0x1000) + (. & (0x1000 - 1));
@@ -39,7 +39,6 @@ SECTIONS
{
*(.data.cacheline_aligned)
}
-
. = ALIGN(64); /* COHERENCY_UNIT */
.data.read_mostly :
AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
Index: src/sys/arch/i386/conf/kern.ldscript.4MB
diff -u src/sys/arch/i386/conf/kern.ldscript.4MB:1.9 src/sys/arch/i386/conf/kern.ldscript.4MB:1.10
--- src/sys/arch/i386/conf/kern.ldscript.4MB:1.9 Thu Oct 18 15:28:34 2007
+++ src/sys/arch/i386/conf/kern.ldscript.4MB Sun Sep 23 01:01:17 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.4MB,v 1.9 2007/10/18 15:28:34 yamt Exp $ */
+/* $NetBSD: kern.ldscript.4MB,v 1.10 2012/09/23 01:01:17 chs Exp $ */
OUTPUT_FORMAT("elf32-i386", "elf32-i386",
"elf32-i386")
@@ -33,8 +33,20 @@ SECTIONS
AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
{
*(.data)
- *(.data.*)
}
+ . = ALIGN(64); /* COHERENCY_UNIT */
+ .data.cacheline_aligned :
+ AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
+ {
+ *(.data.cacheline_aligned)
+ }
+ . = ALIGN(64); /* COHERENCY_UNIT */
+ .data.read_mostly :
+ AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
+ {
+ *(.data.read_mostly)
+ }
+ . = ALIGN(64); /* COHERENCY_UNIT */
_edata = . ;
PROVIDE (edata = .) ;
__bss_start = . ;
Index: src/sys/arch/i386/conf/kern.ldscript.Xen
diff -u src/sys/arch/i386/conf/kern.ldscript.Xen:1.3 src/sys/arch/i386/conf/kern.ldscript.Xen:1.4
--- src/sys/arch/i386/conf/kern.ldscript.Xen:1.3 Thu Oct 18 15:28:34 2007
+++ src/sys/arch/i386/conf/kern.ldscript.Xen Sun Sep 23 01:01:17 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.Xen,v 1.3 2007/10/18 15:28:34 yamt Exp $ */
+/* $NetBSD: kern.ldscript.Xen,v 1.4 2012/09/23 01:01:17 chs Exp $ */
OUTPUT_FORMAT("elf32-i386", "elf32-i386",
"elf32-i386")
@@ -28,8 +28,20 @@ SECTIONS
.data :
{
*(.data)
- *(.data.*)
}
+ . = ALIGN(64); /* COHERENCY_UNIT */
+ .data.cacheline_aligned :
+ AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
+ {
+ *(.data.cacheline_aligned)
+ }
+ . = ALIGN(64); /* COHERENCY_UNIT */
+ .data.read_mostly :
+ AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
+ {
+ *(.data.read_mostly)
+ }
+ . = ALIGN(64); /* COHERENCY_UNIT */
_edata = . ;
PROVIDE (edata = .) ;
__bss_start = . ;
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: sborrill Date: Fri Aug 10 11:32:33 UTC 2012 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: Add uts(4) To generate a diff of this commit: cvs rdiff -u -r1.1077 -r1.1078 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1077 src/sys/arch/i386/conf/GENERIC:1.1078 --- src/sys/arch/i386/conf/GENERIC:1.1077 Wed Aug 1 04:20:05 2012 +++ src/sys/arch/i386/conf/GENERIC Fri Aug 10 11:32:32 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1077 2012/08/01 04:20:05 matt Exp $ +# $NetBSD: GENERIC,v 1.1078 2012/08/10 11:32:32 sborrill Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1077 $" +#ident "GENERIC-$Revision: 1.1078 $" maxusers 64 # estimated number of users @@ -1155,6 +1155,10 @@ uhidev* at uhub? port ? configuration ? ums* at uhidev? reportid ? wsmouse* at ums? mux 0 +# USB generic touchscreen +uts* at uhidev? reportid ? +wsmouse* at uts? mux 0 + # USB eGalax touch-panel uep* at uhub? port ? wsmouse* at uep? mux 0
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: riastradh Date: Sat Aug 4 04:39:40 UTC 2012 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Add uatp(4) to i386 ALL kernel configuration. To generate a diff of this commit: cvs rdiff -u -r1.341 -r1.342 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.341 src/sys/arch/i386/conf/ALL:1.342 --- src/sys/arch/i386/conf/ALL:1.341 Mon Jul 30 19:40:52 2012 +++ src/sys/arch/i386/conf/ALL Sat Aug 4 04:39:40 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.341 2012/07/30 19:40:52 degroote Exp $ +# $NetBSD: ALL,v 1.342 2012/08/04 04:39:40 riastradh 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.341 $" +#ident "ALL-$Revision: 1.342 $" maxusers 64 # estimated number of users @@ -1203,6 +1203,10 @@ wsmouse* at ums? mux 0 uep* at uhub? port ? wsmouse* at uep? mux 0 +# USB Apple trackpad +uatp* at uhidev? reportid ? +wsmouse* at uatp? mux 0 + uyurex* at uhidev? reportid ? # USB Keyboards
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: matt Date: Sun Jul 22 14:23:47 UTC 2012 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Add a few missing devices. To generate a diff of this commit: cvs rdiff -u -r1.339 -r1.340 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.339 src/sys/arch/i386/conf/ALL:1.340 --- src/sys/arch/i386/conf/ALL:1.339 Tue Jun 5 08:44:12 2012 +++ src/sys/arch/i386/conf/ALL Sun Jul 22 14:23:47 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.339 2012/06/05 08:44:12 abs Exp $ +# $NetBSD: ALL,v 1.340 2012/07/22 14:23:47 matt 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.339 $" +#ident "ALL-$Revision: 1.340 $" maxusers 64 # estimated number of users @@ -993,6 +993,7 @@ bce* at pci? dev ? function ? # Broadcom bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet 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 @@ -1035,6 +1036,7 @@ tlp* at pci? dev ? function ? # DECchip txp* at pci? dev ? function ? # 3com 3cr990 vge* at pci? dev ? function ? # VIATech VT612X Gigabit Ethernet vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet +vte* at pci? dev ? function ? # Vortex86 RDC R6040 Fast Ethernet wi* at pci? dev ? function ? # Intersil Prism Mini-PCI (802.11b) wm* at pci? dev ? function ? # Intel 8254x gigabit wpi* at pci? dev ? function ? # Intel PRO/Wireless 3945ABG @@ -1149,6 +1151,7 @@ nsphy* at mii? phy ? # NS83840 PHYs nsphyter* at mii? phy ? # NS83843 PHYs pnaphy* at mii? phy ? # generic HomePNA PHYs qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs +rdcphy* at mii? phy ? # RDC R6040 internal PHY rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs rlphy* at mii? phy ? # Realtek 8139/8201L PHYs sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: christos Date: Tue Apr 10 23:59:48 UTC 2012 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Add apple partition recognition. To generate a diff of this commit: cvs rdiff -u -r1.334 -r1.335 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.334 src/sys/arch/i386/conf/ALL:1.335 --- src/sys/arch/i386/conf/ALL:1.334 Sat Mar 10 16:51:52 2012 +++ src/sys/arch/i386/conf/ALL Tue Apr 10 19:59:47 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.334 2012/03/10 21:51:52 joerg Exp $ +# $NetBSD: ALL,v 1.335 2012/04/10 23:59:47 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.334 $" +#ident "ALL-$Revision: 1.335 $" maxusers 64 # estimated number of users @@ -158,6 +158,7 @@ options DKWEDGE_METHOD_GPT # Supports G # The following two options can break /etc/fstab, so handle with care options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges +options DKWEDGE_METHOD_APPLE# Support Apple partitions as wedges # File systems file-system FFS # UFS
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: christos Date: Sat Apr 7 05:40:42 UTC 2012 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: add apple autodiscovery To generate a diff of this commit: cvs rdiff -u -r1.1068 -r1.1069 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1068 src/sys/arch/i386/conf/GENERIC:1.1069 --- src/sys/arch/i386/conf/GENERIC:1.1068 Sat Mar 24 20:11:16 2012 +++ src/sys/arch/i386/conf/GENERIC Sat Apr 7 01:40:41 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1068 2012/03/25 00:11:16 nonaka Exp $ +# $NetBSD: GENERIC,v 1.1069 2012/04/07 05:40:41 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1068 $" +#ident "GENERIC-$Revision: 1.1069 $" maxusers 64 # estimated number of users @@ -151,9 +151,10 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p # Wedge support options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges -# The following two options can break /etc/fstab, so handle with care +# The following three options can break /etc/fstab, so handle with care #options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges +#options DKWEDGE_METHOD_APPLE# Support Apple partitions as wedges file-system FFS # UFS file-system NFS # Network File System client
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: tron Date: Tue Feb 28 07:47:50 UTC 2012 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Add Chip File System. To generate a diff of this commit: cvs rdiff -u -r1.332 -r1.333 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.332 src/sys/arch/i386/conf/ALL:1.333 --- src/sys/arch/i386/conf/ALL:1.332 Fri Feb 3 23:37:20 2012 +++ src/sys/arch/i386/conf/ALL Tue Feb 28 07:47:50 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.332 2012/02/03 23:37:20 christos Exp $ +# $NetBSD: ALL,v 1.333 2012/02/28 07:47:50 tron 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.332 $" +#ident "ALL-$Revision: 1.333 $" maxusers 64 # estimated number of users @@ -189,6 +189,7 @@ file-system FILECORE # Acorn filecore f file-system ADOSFS # AmigaDOS file system file-system NILFS # experimental - NTT's NiLFS(2) file-system V7FS # 7th Edition(V7) File System +file-system CHFS # Chip File System # File system options options QUOTA # legacy UFS quotas
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: christos Date: Fri Feb 3 23:37:20 UTC 2012 Modified Files: src/sys/arch/i386/conf: ALL Log Message: add tpm To generate a diff of this commit: cvs rdiff -u -r1.331 -r1.332 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.331 src/sys/arch/i386/conf/ALL:1.332 --- src/sys/arch/i386/conf/ALL:1.331 Sun Jan 29 13:55:12 2012 +++ src/sys/arch/i386/conf/ALL Fri Feb 3 18:37:20 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.331 2012/01/29 18:55:12 jakllsch Exp $ +# $NetBSD: ALL,v 1.332 2012/02/03 23:37: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.331 $" +#ident "ALL-$Revision: 1.332 $" maxusers 64 # estimated number of users @@ -388,6 +388,7 @@ npx* at acpi? # Math coprocessor pckbc* at acpi? # PC keyboard controller pcppi* at acpi? # AT-style speaker sound thinkpad* at acpi? # IBM/Lenovo Thinkpad hotkeys +#tpm* at acpi? # ACPI TPM (Experimental) ug* at acpi? # Abit uGuru Hardware monitor wb* at acpi? # Winbond W83L518D SD/MMC reader sdmmc* at wb? # SD/MMC bus @@ -1564,6 +1565,13 @@ hifn* at pci? dev ? function ? # Hifn 77 ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x +# Trusted Platform Module +tpm* at isa? iomem 0xfed4 irq 7 +#tpm* at isa? port 0x02e +#tpm* at isa? port 0x04e +#tpm* at isa? port 0x07e +#tpm* at isa? port 0x0ee + # Joysticks joy* at pnpbios? index ? # Game port
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jakllsch Date: Sun Jan 29 18:55:13 UTC 2012 Modified Files: src/sys/arch/i386/conf: ALL Log Message: options MALLOC_DEBUG is no longer expected to compile, but has not yet been removed. Avoid compiling it here. To generate a diff of this commit: cvs rdiff -u -r1.330 -r1.331 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.330 src/sys/arch/i386/conf/ALL:1.331 --- src/sys/arch/i386/conf/ALL:1.330 Sat Jan 14 12:30:12 2012 +++ src/sys/arch/i386/conf/ALL Sun Jan 29 18:55:12 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.330 2012/01/14 12:30:12 tron Exp $ +# $NetBSD: ALL,v 1.331 2012/01/29 18:55:12 jakllsch 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.330 $" +#ident "ALL-$Revision: 1.331 $" maxusers 64 # estimated number of users @@ -2136,7 +2136,6 @@ options LOAD_DEBUG_INFO options LOCKF_DEBUG options LPT_DEBUG options MAGMA_DEBUG -options MALLOC_DEBUG options MAPLE_DEBUG options MB8795_DEBUG options MCDDEBUG
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: hannken Date: Sun Jan 29 18:29:12 UTC 2012 Modified Files: src/sys/arch/i386/conf: INSTALL_FLOPPY Log Message: Add virtio driver to INSTALL_FLOPPY. Requested by Matthias Scheler for particular cases like http://mail-index.netbsd.org/netbsd-users/2011/09/13/msg009128.html To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/conf/INSTALL_FLOPPY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/INSTALL_FLOPPY diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.14 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.15 --- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.14 Tue Nov 22 21:25:20 2011 +++ src/sys/arch/i386/conf/INSTALL_FLOPPY Sun Jan 29 18:29:11 2012 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_FLOPPY,v 1.14 2011/11/22 21:25:20 tls Exp $ +# $NetBSD: INSTALL_FLOPPY,v 1.15 2012/01/29 18:29:11 hannken Exp $ # # INSTALL - Installation kernel. # @@ -740,6 +740,11 @@ url* at uhub? port ? # Realtek RTL8150L # Planetconnect Satellite receiver driver. #satlink0 at isa? port 0x300 drq 1 +# Virtio devices +virtio* at pci? dev ? function ? # Virtio PCI device +viomb* at virtio? # Virtio memory balloon device +ld* at virtio? # Virtio disk device +vioif* at virtio? # Virtio network device # Pull in optional local configuration cinclude "arch/i386/conf/INSTALL.local"
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jmcneill Date: Mon Jan 16 14:43:10 UTC 2012 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: add cir@emdtv To generate a diff of this commit: cvs rdiff -u -r1.1064 -r1.1065 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1064 src/sys/arch/i386/conf/GENERIC:1.1065 --- src/sys/arch/i386/conf/GENERIC:1.1064 Sun Jan 15 15:05:06 2012 +++ src/sys/arch/i386/conf/GENERIC Mon Jan 16 14:43:09 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1064 2012/01/15 15:05:06 jmcneill Exp $ +# $NetBSD: GENERIC,v 1.1065 2012/01/16 14:43:09 jmcneill Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1064 $" +#ident "GENERIC-$Revision: 1.1065 $" maxusers 64 # estimated number of users @@ -1435,6 +1435,7 @@ auvitek* at uhub? # Auvitek AU0828 USB coram* at pci? dev ? function ? # Conexant CX23885 PCI-E TV cxdtv* at pci? dev ? function ? # Conexant CX2388[0-3] PCI TV emdtv* at uhub? # Empia EM28xx USB TV +cir* at emdtv? pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam uvideo* at uhub? # USB Video Class capture devices
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: tron Date: Sat Jan 14 12:30:12 UTC 2012 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Add "CPU_UCODE" option. To generate a diff of this commit: cvs rdiff -u -r1.329 -r1.330 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.329 src/sys/arch/i386/conf/ALL:1.330 --- src/sys/arch/i386/conf/ALL:1.329 Sat Dec 31 00:11:20 2011 +++ src/sys/arch/i386/conf/ALL Sat Jan 14 12:30:12 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.329 2011/12/31 00:11:20 christos Exp $ +# $NetBSD: ALL,v 1.330 2012/01/14 12:30:12 tron 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.329 $" +#ident "ALL-$Revision: 1.330 $" maxusers 64 # estimated number of users @@ -79,6 +79,8 @@ options NTP # NTP phase/frequency lock options KTRACE # system call tracing via ktrace(1) +options CPU_UCODE # cpu ucode loading support + # Note: SysV IPC parameters could be changed dynamically, see sysctl(8). options SYSVMSG # System V-like message queues options SYSVSEM # System V-like semaphores
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: tron Date: Sat Jan 14 12:14:28 UTC 2012 Modified Files: src/sys/arch/i386/conf: GENERIC XEN3_DOM0 Log Message: Use "optionsCPU_UCODE" to keep the indentation if the option is commented out. To generate a diff of this commit: cvs rdiff -u -r1.1062 -r1.1063 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.59 -r1.60 src/sys/arch/i386/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1062 src/sys/arch/i386/conf/GENERIC:1.1063 --- src/sys/arch/i386/conf/GENERIC:1.1062 Fri Jan 13 16:05:14 2012 +++ src/sys/arch/i386/conf/GENERIC Sat Jan 14 12:14:28 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1062 2012/01/13 16:05:14 cegger Exp $ +# $NetBSD: GENERIC,v 1.1063 2012/01/14 12:14:28 tron Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1062 $" +#ident "GENERIC-$Revision: 1.1063 $" maxusers 64 # estimated number of users @@ -80,7 +80,7 @@ options NTP # NTP phase/frequency lock options KTRACE # system call tracing via ktrace(1) -options CPU_UCODE # cpu ucode loading support +options CPU_UCODE # cpu ucode loading support # Note: SysV IPC parameters can be changed dynamically; see sysctl(8). options SYSVMSG # System V-like message queues Index: src/sys/arch/i386/conf/XEN3_DOM0 diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.59 src/sys/arch/i386/conf/XEN3_DOM0:1.60 --- src/sys/arch/i386/conf/XEN3_DOM0:1.59 Fri Jan 13 16:05:14 2012 +++ src/sys/arch/i386/conf/XEN3_DOM0 Sat Jan 14 12:14:28 2012 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.59 2012/01/13 16:05:14 cegger Exp $ +# $NetBSD: XEN3_DOM0,v 1.60 2012/01/14 12:14:28 tron Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -45,7 +45,7 @@ options NTP # NTP phase/frequency lock options KTRACE # system call tracing via ktrace(1) -options CPU_UCODE # cpu ucode loading support +options CPU_UCODE # cpu ucode loading support options SYSVMSG # System V-like message queues options SYSVSEM # System V-like semaphores
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: christos Date: Sat Dec 31 00:11:21 UTC 2011 Modified Files: src/sys/arch/i386/conf: ALL GENERIC Log Message: add uipad To generate a diff of this commit: cvs rdiff -u -r1.328 -r1.329 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1060 -r1.1061 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.328 src/sys/arch/i386/conf/ALL:1.329 --- src/sys/arch/i386/conf/ALL:1.328 Sun Dec 18 00:49:28 2011 +++ src/sys/arch/i386/conf/ALL Fri Dec 30 19:11:20 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.328 2011/12/18 05:49:28 dholland Exp $ +# $NetBSD: ALL,v 1.329 2011/12/31 00:11: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.328 $" +#ident "ALL-$Revision: 1.329 $" maxusers 64 # estimated number of users @@ -1305,6 +1305,9 @@ ucom* at uhmodem? portno ? # RIM BlackBerry uberry* at uhub? port ? +# Apple iPad +uipad* at uhub? port ? + # Diamond Multimedia Rio 500 urio* at uhub? port ? Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1060 src/sys/arch/i386/conf/GENERIC:1.1061 --- src/sys/arch/i386/conf/GENERIC:1.1060 Sun Dec 18 00:49:28 2011 +++ src/sys/arch/i386/conf/GENERIC Fri Dec 30 19:11:21 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1060 2011/12/18 05:49:28 dholland Exp $ +# $NetBSD: GENERIC,v 1.1061 2011/12/31 00:11:21 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1060 $" +#ident "GENERIC-$Revision: 1.1061 $" maxusers 64 # estimated number of users @@ -1255,6 +1255,9 @@ ucom* at uvscom? portno ? # RIM BlackBerry uberry* at uhub? port ? +# Apple iPad +uipad* at uhub? port ? + # Diamond Multimedia Rio 500 urio* at uhub? port ?
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: dholland Date: Sun Dec 18 02:31:51 UTC 2011 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: adjust English usage in comment To generate a diff of this commit: cvs rdiff -u -r1.1058 -r1.1059 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1058 src/sys/arch/i386/conf/GENERIC:1.1059 --- src/sys/arch/i386/conf/GENERIC:1.1058 Tue Nov 22 21:25:19 2011 +++ src/sys/arch/i386/conf/GENERIC Sun Dec 18 02:31:51 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1058 2011/11/22 21:25:19 tls Exp $ +# $NetBSD: GENERIC,v 1.1059 2011/12/18 02:31:51 dholland Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1058 $" +#ident "GENERIC-$Revision: 1.1059 $" maxusers 64 # estimated number of users @@ -80,7 +80,7 @@ options NTP # NTP phase/frequency lock options KTRACE # system call tracing via ktrace(1) -# Note: SysV IPC parameters could be changed dynamically, see sysctl(8). +# Note: SysV IPC parameters can be changed dynamically; see sysctl(8). options SYSVMSG # System V-like message queues options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: mbalmer Date: Sun Nov 13 12:47:55 UTC 2011 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: Add gpiopwm(4). To generate a diff of this commit: cvs rdiff -u -r1.1056 -r1.1057 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1056 src/sys/arch/i386/conf/GENERIC:1.1057 --- src/sys/arch/i386/conf/GENERIC:1.1056 Sun Nov 13 09:41:46 2011 +++ src/sys/arch/i386/conf/GENERIC Sun Nov 13 12:47:54 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1056 2011/11/13 09:41:46 mbalmer Exp $ +# $NetBSD: GENERIC,v 1.1057 2011/11/13 12:47:54 mbalmer Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1056 $" +#ident "GENERIC-$Revision: 1.1057 $" maxusers 64 # estimated number of users @@ -722,6 +722,9 @@ iic* at gpioiic? # Keylock support gpiolock* at gpio? +# Software pulsing GPIO pins +gpiopwm* at gpio? + # SCSI Controllers and Devices # PCI SCSI controllers
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: mbalmer Date: Sun Nov 13 09:41:47 UTC 2011 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: Enable nsclpcsio and gpio devices. To generate a diff of this commit: cvs rdiff -u -r1.1055 -r1.1056 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1055 src/sys/arch/i386/conf/GENERIC:1.1056 --- src/sys/arch/i386/conf/GENERIC:1.1055 Sun Oct 30 12:12:21 2011 +++ src/sys/arch/i386/conf/GENERIC Sun Nov 13 09:41:46 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1055 2011/10/30 12:12:21 hannken Exp $ +# $NetBSD: GENERIC,v 1.1056 2011/11/13 09:41:46 mbalmer Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1055 $" +#ident "GENERIC-$Revision: 1.1056 $" maxusers 64 # estimated number of users @@ -679,7 +679,7 @@ iic* at piixpm? # SMBus on PIIX4 #smscmon* at iic? addr 0x2d # (alternate address) # PC87366 hardware monitor -#nsclpcsio* at isa? +nsclpcsio* at isa? # Abit uGuru Hardware system monitor #ug0 at isa? port 0xe0 @@ -704,23 +704,23 @@ ld* at iop? tid ? # block devices dpti* at iop? tid 0 # DPT/Adaptec control interface # GPIO devices -#gpio* at gpiobus? +gpio* at gpiobus? # 1-Wire support #gpioow* at gpio? offset ? mask ? # 1-wire bitbanging via gpio -#gpioow* at gpio? -#onewire* at gpioow? +gpioow* at gpio? +onewire* at gpioow? # 1-Wire devices -#owtemp* at onewire? # Temperature sensors +owtemp* at onewire? # Temperature sensors # i2c support -#gpioiic* at gpio? offset ? mask ? flag 0x00 # flag 0x01 reverses +gpioiic* at gpio? offset ? mask ? flag 0x00 # flag 0x01 reverses # SCA and SCL signals -#iic* at gpioiic? +iic* at gpioiic? # Keylock support -#gpiolock* at gpio? +gpiolock* at gpio? # SCSI Controllers and Devices
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jmcneill Date: Mon Oct 17 22:40:31 UTC 2011 Modified Files: src/sys/arch/i386/conf: ALL Log Message: add vmt(4) To generate a diff of this commit: cvs rdiff -u -r1.323 -r1.324 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.323 src/sys/arch/i386/conf/ALL:1.324 --- src/sys/arch/i386/conf/ALL:1.323 Sat Oct 15 00:23:08 2011 +++ src/sys/arch/i386/conf/ALL Mon Oct 17 22:40:31 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.323 2011/10/15 00:23:08 sjg Exp $ +# $NetBSD: ALL,v 1.324 2011/10/17 22:40:31 jmcneill 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.323 $" +#ident "ALL-$Revision: 1.324 $" maxusers 64 # estimated number of users @@ -37,6 +37,7 @@ odcm0 at cpu0 # On-demand clock modula padlock0 at cpu0 # VIA PadLock powernow0 at cpu0 # AMD PowerNow! and Cool'n'Quiet (non-ACPI) viac7temp* at cpu? # VIA C7 temperature sensor +vmt0 at cpu0 # VMware Tools # XBOX support options XBOX
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: mbalmer Date: Sun Oct 2 12:19:17 UTC 2011 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: Document gpioiic flag in a comment. To generate a diff of this commit: cvs rdiff -u -r1.1053 -r1.1054 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1053 src/sys/arch/i386/conf/GENERIC:1.1054 --- src/sys/arch/i386/conf/GENERIC:1.1053 Sun Sep 4 12:31:30 2011 +++ src/sys/arch/i386/conf/GENERIC Sun Oct 2 12:19:17 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1053 2011/09/04 12:31:30 mbalmer Exp $ +# $NetBSD: GENERIC,v 1.1054 2011/10/02 12:19:17 mbalmer Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1053 $" +#ident "GENERIC-$Revision: 1.1054 $" maxusers 64 # estimated number of users @@ -715,7 +715,8 @@ dpti* at iop? tid 0 # DPT/Adaptec cont #owtemp* at onewire? # Temperature sensors # i2c support -#gpioiic* at gpio? +#gpioiic* at gpio? offset ? mask ? flag 0x00 # flag 0x01 reverses + # SCA and SCL signals #iic* at gpioiic? # Keylock support
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jakllsch Date: Mon Sep 26 18:14:07 UTC 2011 Modified Files: src/sys/arch/i386/conf: ALL Log Message: options PMS_DISABLE_POWERHOOK is obsolete. To generate a diff of this commit: cvs rdiff -u -r1.320 -r1.321 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.320 src/sys/arch/i386/conf/ALL:1.321 --- src/sys/arch/i386/conf/ALL:1.320 Thu Sep 22 01:15:31 2011 +++ src/sys/arch/i386/conf/ALL Mon Sep 26 18:14:07 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.320 2011/09/22 01:15:31 jakllsch Exp $ +# $NetBSD: ALL,v 1.321 2011/09/26 18:14:07 jakllsch 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.320 $" +#ident "ALL-$Revision: 1.321 $" maxusers 64 # estimated number of users @@ -556,7 +556,6 @@ npx0 at isa? port 0xf0 irq 13 # x86 math pckbc0 at isa? # PC keyboard controller pckbd* at pckbc? # PC keyboard pms* at pckbc? # PS/2 mouse for wsmouse -options PMS_DISABLE_POWERHOOK # Disable PS/2 reset on resume options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads vga0 at isa?
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: ahoka Date: Wed Sep 21 10:18:52 UTC 2011 Added Files: src/sys/arch/i386/conf: MODULAR Log Message: Initial version of a pro-module kernel config To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/i386/conf/MODULAR Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/i386/conf/MODULAR diff -u /dev/null src/sys/arch/i386/conf/MODULAR:1.1 --- /dev/null Wed Sep 21 10:18:52 2011 +++ src/sys/arch/i386/conf/MODULAR Wed Sep 21 10:18:52 2011 @@ -0,0 +1,77 @@ +# $NetBSD: MODULAR,v 1.1 2011/09/21 10:18:52 ahoka Exp $ +# +# MODULAR kernel +# This kernel config prefers loading kernel drivers from file system. +# Please see module(7) for more information. +# +include "arch/i386/conf/GENERIC" + +# these features are available as modules +# +no options P1003_1B_SEMAPHORE # p1003.1b semaphore support +no options AIO # POSIX asynchronous I/O, built as a module +no options MQUEUE # POSIX messsage queues, built as a module +no options NFSSERVER # Network File System server + +# compatibility options, built as modules +# +no options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility +no options COMPAT_SVR4 # binary compatibility with SVR4 +no options COMPAT_IBCS2 # binary compatibility with SCO and ISC +no options COMPAT_LINUX # binary compatibility with Linux +no options COMPAT_FREEBSD # binary compatibility with FreeBSD + +# build non boot critical file systems as modules +# +no file-system EXT2FS # second extended file system (linux) +no file-system LFS # log-structured file system +no file-system NTFS # Windows/NT file system (experimental) +no file-system MSDOSFS # MS-DOS file system +no file-system KERNFS # /kern +no file-system OVERLAY # overlay file system +no file-system PROCFS # /proc +no file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs) +no file-system UMAPFS # NULLFS + uid and gid remapping +no file-system UNION # union file system +no file-system CODA # Coda File System; also needs vcoda (below) +no file-system SMBFS # experimental - CIFS; also needs nsmb (below) + +# accept filters, built as modules +# +no pseudo-device accf_data # "dataready" accept filter +no pseudo-device accf_http # "httpready" accept filter + +# pseudo devices, available as modules +# +no pseudo-device vcoda # coda minicache <-> venus comm. +no pseudo-device nsmb # experimental - SMB requester + +# these drivers are available as modules +# +#no acpiacad* +#no acpibat* +#no acpibut* +#no acpicpu* +#no acpidalb* +#no acpifan* +#no acpilid* +#no acpitz* +#no acpivga* +#no acpiwdrt* +#no acpiwmi* + +#no aibs* + +no uvideo* +no pseye* + +no hdaudio* +no hdafg* + +#no cir* +#no irmce* + +#no alc* +#no ath* +#no axe* +#no rum*
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: christos Date: Wed Sep 14 14:58:08 UTC 2011 Modified Files: src/sys/arch/i386/conf: Makefile.i386 Log Message: include wakecode after so that the depend rules are defined! To generate a diff of this commit: cvs rdiff -u -r1.174 -r1.175 src/sys/arch/i386/conf/Makefile.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/Makefile.i386 diff -u src/sys/arch/i386/conf/Makefile.i386:1.174 src/sys/arch/i386/conf/Makefile.i386:1.175 --- src/sys/arch/i386/conf/Makefile.i386:1.174 Sun Aug 7 10:39:15 2011 +++ src/sys/arch/i386/conf/Makefile.i386 Wed Sep 14 10:58:08 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.i386,v 1.174 2011/08/07 14:39:15 jakllsch Exp $ +# $NetBSD: Makefile.i386,v 1.175 2011/09/14 14:58:08 christos Exp $ # Makefile for NetBSD # @@ -117,14 +117,14 @@ %RULES -## Include rules for ACPI wakecode -.include "$S/arch/x86/acpi/Makefile.wakecode.inc" - ## ## (9) port independent kernel machinery ## .include "$S/conf/Makefile.kern.inc" +## Include rules for ACPI wakecode +.include "$S/arch/x86/acpi/Makefile.wakecode.inc" + ## ## (10) Appending make options. ##
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: mbalmer Date: Sun Sep 4 12:31:30 UTC 2011 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: Disable gpio(4) which can now be built and used as modules. To generate a diff of this commit: cvs rdiff -u -r1.1052 -r1.1053 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1052 src/sys/arch/i386/conf/GENERIC:1.1053 --- src/sys/arch/i386/conf/GENERIC:1.1052 Tue Aug 30 13:03:17 2011 +++ src/sys/arch/i386/conf/GENERIC Sun Sep 4 12:31:30 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1052 2011/08/30 13:03:17 mbalmer Exp $ +# $NetBSD: GENERIC,v 1.1053 2011/09/04 12:31:30 mbalmer Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1052 $" +#ident "GENERIC-$Revision: 1.1053 $" maxusers 64 # estimated number of users @@ -704,19 +704,19 @@ dpti* at iop? tid 0 # DPT/Adaptec control interface # GPIO devices -gpio* at gpiobus? +#gpio* at gpiobus? # 1-Wire support #gpioow* at gpio? offset ? mask ? # 1-wire bitbanging via gpio -gpioow* at gpio? -onewire* at gpioow? +#gpioow* at gpio? +#onewire* at gpioow? # 1-Wire devices -owtemp* at onewire? # Temperature sensors +#owtemp* at onewire? # Temperature sensors # i2c support -gpioiic* at gpio? -iic* at gpioiic? +#gpioiic* at gpio? +#iic* at gpioiic? # Keylock support #gpiolock* at gpio?
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: mbalmer Date: Tue Aug 30 13:03:17 UTC 2011 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: Attach gpio* at gpiobus? instead of at individual drivers. To generate a diff of this commit: cvs rdiff -u -r1.1051 -r1.1052 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1051 src/sys/arch/i386/conf/GENERIC:1.1052 --- src/sys/arch/i386/conf/GENERIC:1.1051 Tue Aug 30 12:13:25 2011 +++ src/sys/arch/i386/conf/GENERIC Tue Aug 30 13:03:17 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1051 2011/08/30 12:13:25 jmcneill Exp $ +# $NetBSD: GENERIC,v 1.1052 2011/08/30 13:03:17 mbalmer Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1051 $" +#ident "GENERIC-$Revision: 1.1052 $" maxusers 64 # estimated number of users @@ -441,7 +441,6 @@ # System Controllers elansc* at mainbus? bus ? # AMD Elan SC520 System Controller -gpio* at elansc? # Temperatures amdtemp* at pchb? # AMD CPU Temperature sensors @@ -454,7 +453,7 @@ fwhrng* at ichlpcib? # Intel 82802 FWH Random Number Generator #hpet* at ichlpcib? gcscpcib* at pci? dev ? function ? # AMD CS5535/CS5536 PCI-ISA w/ -gpio* at gcscpcib? # timecounter, watchdog and GPIO + # timecounter, watchdog and GPIO #piixpcib* at pci? dev ? function ? # Intel PIIX4 PCI-ISA w/ SpeedStep gscpcib* at pci? dev ? function ? # NS Geode SC1100 PCI-ISA w/ GPIO viapcib* at pci? dev ? function ? # VIA VT8235 PCI-ISA w/ SMBus support @@ -681,7 +680,6 @@ # PC87366 hardware monitor #nsclpcsio* at isa? -#gpio* at nsclpcsio? # Abit uGuru Hardware system monitor #ug0 at isa? port 0xe0 @@ -706,8 +704,7 @@ dpti* at iop? tid 0 # DPT/Adaptec control interface # GPIO devices -gpio* at gscpcib? -#gpio* at gpiosim? +gpio* at gpiobus? # 1-Wire support #gpioow* at gpio? offset ? mask ? # 1-wire bitbanging via gpio
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: mbalmer Date: Sat Aug 27 09:28:56 UTC 2011 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: Enable some gpio devices. To generate a diff of this commit: cvs rdiff -u -r1.1048 -r1.1049 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1048 src/sys/arch/i386/conf/GENERIC:1.1049 --- src/sys/arch/i386/conf/GENERIC:1.1048 Thu Aug 18 20:55:20 2011 +++ src/sys/arch/i386/conf/GENERIC Sat Aug 27 09:28:55 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1048 2011/08/18 20:55:20 jakllsch Exp $ +# $NetBSD: GENERIC,v 1.1049 2011/08/27 09:28:55 mbalmer Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1048 $" +#ident "GENERIC-$Revision: 1.1049 $" maxusers 64 # estimated number of users @@ -456,7 +456,7 @@ gcscpcib* at pci? dev ? function ? # AMD CS5535/CS5536 PCI-ISA w/ gpio* at gcscpcib? # timecounter, watchdog and GPIO #piixpcib* at pci? dev ? function ? # Intel PIIX4 PCI-ISA w/ SpeedStep -#gscpcib* at pci? dev ? function ? # NS Geode PCI-ISA w/ GPIO support +gscpcib* at pci? dev ? function ? # NS Geode SC1100 PCI-ISA w/ GPIO viapcib* at pci? dev ? function ? # VIA VT8235 PCI-ISA w/ SMBus support iic* at viapcib? rdcpcib* at pci? dev ? function ? # RDC Vortex86/PMX-1000 PCI-ISA w/ @@ -706,16 +706,20 @@ dpti* at iop? tid 0 # DPT/Adaptec control interface # GPIO devices -#gpio* at gscpcib? +gpio* at gscpcib? #gpio* at gpiosim? # 1-Wire support #gpioow* at gpio? offset ? mask ? # 1-wire bitbanging via gpio -#gpioow* at gpio? -#onewire* at gpioow? +gpioow* at gpio? +onewire* at gpioow? # 1-Wire devices -#owtemp* at onewire? # Temperature sensors +owtemp* at onewire? # Temperature sensors + +# i2c support +gpioiic* at gpio? +iic* at gpioiic? # Keylock support #gpiolock* at gpio?
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: mbalmer Date: Thu Aug 11 07:38:56 UTC 2011 Modified Files: src/sys/arch/i386/conf: ALL GENERIC Log Message: Add entries for pwdog(4). To generate a diff of this commit: cvs rdiff -u -r1.317 -r1.318 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1046 -r1.1047 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.317 src/sys/arch/i386/conf/ALL:1.318 --- src/sys/arch/i386/conf/ALL:1.317 Thu Aug 4 14:45:54 2011 +++ src/sys/arch/i386/conf/ALL Thu Aug 11 07:38:56 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.317 2011/08/04 14:45:54 jakllsch Exp $ +# $NetBSD: ALL,v 1.318 2011/08/11 07:38:56 mbalmer Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.317 $" +#ident "ALL-$Revision: 1.318 $" maxusers 64 # estimated number of users @@ -496,6 +496,8 @@ # XXX 'puc's aren't really bridges, but there's no better place for them here puc* at pci? dev ? function ? # PCI "universal" comm. cards +pwdog* at pci? dev ? function ? # QUANCOM PWDOG1 + agp* at pchb? Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1046 src/sys/arch/i386/conf/GENERIC:1.1047 --- src/sys/arch/i386/conf/GENERIC:1.1046 Tue Aug 9 02:52:29 2011 +++ src/sys/arch/i386/conf/GENERIC Thu Aug 11 07:38:56 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1046 2011/08/09 02:52:29 jmcneill Exp $ +# $NetBSD: GENERIC,v 1.1047 2011/08/11 07:38:56 mbalmer Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1046 $" +#ident "GENERIC-$Revision: 1.1047 $" maxusers 64 # estimated number of users @@ -469,6 +469,8 @@ # XXX 'puc's aren't really bridges, but there's no better place for them here puc* at pci? dev ? function ? # PCI "universal" comm. cards +pwdog* at pci ? dev ? function ? # QUANCOM PWDOG1 + agp* at pchb?
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jakllsch Date: Tue Aug 9 14:18:17 UTC 2011 Modified Files: src/sys/arch/i386/conf: MONOLITHIC Log Message: While the GENERIC/MONOLITHIC/MODULAR issue remains to be sorted out, MONOLITHIC is still a part of the release build and needs to remain config(1)urable. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/i386/conf/MONOLITHIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/MONOLITHIC diff -u src/sys/arch/i386/conf/MONOLITHIC:1.15 src/sys/arch/i386/conf/MONOLITHIC:1.16 --- src/sys/arch/i386/conf/MONOLITHIC:1.15 Sun Mar 6 17:08:26 2011 +++ src/sys/arch/i386/conf/MONOLITHIC Tue Aug 9 14:18:17 2011 @@ -1,68 +1,7 @@ -# $NetBSD: MONOLITHIC,v 1.15 2011/03/06 17:08:26 bouyer Exp $ +# $NetBSD: MONOLITHIC,v 1.16 2011/08/09 14:18:17 jakllsch Exp $ # -# Non MODULAR, used mostly as a reference as to what we modularized. +# Non MODULAR # include "arch/i386/conf/GENERIC" no options MODULAR - -options EXEC_AOUT # exec a.out binaries -options EXEC_ELF32 # exec ELF binaries -options EXEC_SCRIPT # exec #! scripts -options COREDUMP - -options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options AIO # POSIX asynchronous I/O, built as a module -options MQUEUE # POSIX messsage queues, built as a module - -options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility -options COMPAT_SVR4 # binary compatibility with SVR4 -options COMPAT_IBCS2 # binary compatibility with SCO and ISC -options COMPAT_LINUX # binary compatibility with Linux -options COMPAT_FREEBSD # binary compatibility with FreeBSD - -#file-system FFS # UFS -#file-system NFS # Network File System client -# File systems -file-system EXT2FS # second extended file system (linux) -file-system LFS # log-structured file system -file-system MFS # memory file system -file-system NTFS # Windows/NT file system (experimental) -file-system CD9660 # ISO 9660 + Rock Ridge file system -file-system MSDOSFS # MS-DOS file system -file-system FDESC # /dev/fd -file-system KERNFS # /kern -file-system NULLFS # loopback file system -file-system OVERLAY # overlay file system -file-system PROCFS # /proc -file-system UMAPFS # NULLFS + uid and gid remapping -file-system UNION # union file system -file-system CODA # Coda File System; also needs vcoda (below) -file-system SMBFS # experimental - CIFS; also needs nsmb (below) -file-system PTYFS # /dev/ptm support -file-system TMPFS # Efficient memory file-system -file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs) - -options QUOTA # legacy UFS quotas -options QUOTA2 # new, in-filesystem UFS quotas - -options NFSSERVER - -options PPP_BSDCOMP # BSD-Compress compression support for PPP -options PPP_DEFLATE # Deflate compression support for PPP - -# NPF -#pseudo-device npf - -pseudo-device accf_data # "dataready" accept filter -pseudo-device accf_http # "httpready" accept filter - -pseudo-device vcoda 4 # coda minicache <-> venus comm. - -pseudo-device nsmb # experimental - SMB requester - -pseudo-device putter # for puffs and pud - -pseudo-device pad # pseudo audio device driver - -pseudo-device dm # device-mapper device driver
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jmcneill Date: Mon Aug 8 18:58:18 UTC 2011 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: remove dtv (available as a module) To generate a diff of this commit: cvs rdiff -u -r1.1044 -r1.1045 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1044 src/sys/arch/i386/conf/GENERIC:1.1045 --- src/sys/arch/i386/conf/GENERIC:1.1044 Mon Aug 8 17:02:31 2011 +++ src/sys/arch/i386/conf/GENERIC Mon Aug 8 18:58:18 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1044 2011/08/08 17:02:31 jakllsch Exp $ +# $NetBSD: GENERIC,v 1.1045 2011/08/08 18:58:18 jmcneill Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1044 $" +#ident "GENERIC-$Revision: 1.1045 $" maxusers 64 # estimated number of users @@ -1421,10 +1421,10 @@ pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam uvideo* at uhub? # USB Video Class capture devices -auvitek* at uhub? # Auvitek AU0828 video capture devices -emdtv* at uhub? # Empia EM28xx video capture devices +#auvitek* at uhub? # Auvitek AU0828 video capture devices +#emdtv* at uhub? # Empia EM28xx video capture devices video* at videobus? -dtv* at dtvbus? +#dtv* at dtvbus? # TV cards @@ -1434,7 +1434,7 @@ radio* at bktr? # Conexant CX2388[0-3]-based DTV cards -cxdtv* at pci? dev ? function ? +#cxdtv* at pci? dev ? function ? #iic* at cxdtv? # Bluetooth Controller and Device support
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jakllsch Date: Mon Aug 8 17:02:32 UTC 2011 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: We have PUFFS, we need putter. To generate a diff of this commit: cvs rdiff -u -r1.1043 -r1.1044 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1043 src/sys/arch/i386/conf/GENERIC:1.1044 --- src/sys/arch/i386/conf/GENERIC:1.1043 Mon Aug 8 16:27:07 2011 +++ src/sys/arch/i386/conf/GENERIC Mon Aug 8 17:02:31 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1043 2011/08/08 16:27:07 jakllsch Exp $ +# $NetBSD: GENERIC,v 1.1044 2011/08/08 17:02:31 jakllsch Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1043 $" +#ident "GENERIC-$Revision: 1.1044 $" maxusers 64 # estimated number of users @@ -1548,6 +1548,7 @@ #options RF_INCLUDE_PARITY_DECLUSTERING=1 #options RF_INCLUDE_PARITY_DECLUSTERING_DS=1 pseudo-device fss # file system snapshot device +pseudo-device putter # for puffs and pud pseudo-device md # memory disk device (ramdisk) options MEMORY_DISK_HOOKS # enable root ramdisk
