Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/pgoyette-compat]: src/sys/arch/amd64/conf Rather than having to track ch...



details:   https://anonhg.NetBSD.org/src/rev/1e566ce003bf
branches:  pgoyette-compat
changeset: 447721:1e566ce003bf
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Tue Jan 22 12:02:05 2019 +0000

description:
Rather than having to track changes in GENERIC and incorporate them
into NOCOMPAT, just include GENERIC and then turn off the various
COMPAT options.

diffstat:

 sys/arch/amd64/conf/NOCOMPAT |  1228 +----------------------------------------
 1 files changed, 31 insertions(+), 1197 deletions(-)

diffs (truncated from 1234 to 300 lines):

diff -r 3b6475a7b437 -r 1e566ce003bf sys/arch/amd64/conf/NOCOMPAT
--- a/sys/arch/amd64/conf/NOCOMPAT      Tue Jan 22 11:48:31 2019 +0000
+++ b/sys/arch/amd64/conf/NOCOMPAT      Tue Jan 22 12:02:05 2019 +0000
@@ -1,1199 +1,33 @@
-# $NetBSD: NOCOMPAT,v 1.1.2.6 2019/01/22 11:48:31 pgoyette Exp $
-#
-# GENERIC machine description file
-#
-# This machine description file is used to generate the default NetBSD
-# kernel.  The generic kernel does not include all options, subsystems
-# and device drivers, but should be useful for most applications.
-#
-# The machine description file can be customised for your specific
-# machine to reduce the kernel size and improve its performance.
-#
-# For further information on compiling NetBSD kernels, see the config(8)
-# man page.
-#
-# For further information on hardware support for this architecture, see
-# the intro(4) man page.  For further information about kernel options
-# for this architecture, see the options(4) man page.  For an explanation
-# of each device driver in this file see the section 4 man page for the
-# device.
-
-include        "arch/amd64/conf/std.amd64"
-
-options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
-
-#ident         "NOCOMPAT-$Revision: 1.1.2.6 $"
-
-maxusers       64              # estimated number of users
-
-# delay between "rebooting ..." message and hardware reset, in milliseconds
-#options       CPURESET_DELAY=2000
-
-# This option allows you to force a serial console at the specified
-# I/O address.   see console(4) for details.
-#options       CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600
-#      you don't want the option below ON iff you are using the
-#      serial console option of the new boot strap code.
-#options       CONS_OVERRIDE   # Always use above! independent of boot info
-
-# The following options override the memory sizes passed in from the boot
-# block.  Use them *only* if the boot block is unable to determine the correct
-# values.  Note that the BIOS may *correctly* report less than 640k of base
-# memory if the extended BIOS data area is located at the top of base memory
-# (as is the case on most recent systems).
-#options       REALBASEMEM=639         # size of base memory (in KB)
-#options       REALEXTMEM=15360        # size of extended memory (in KB)
-
-# The following options limit the overall size of physical memory
-# and/or the maximum address used by the system.
-# Contrary to REALBASEMEM and REALEXTMEM, they still use the BIOS memory map
-# and can deal with holes in the memory layout.
-#options       PHYSMEM_MAX_SIZE=64     # max size of physical memory (in MB)
-#options       PHYSMEM_MAX_ADDR=2048   # don't use memory above this (in MB)
-
-# Standard system options
-
-options        INSECURE        # disable kernel security levels - X needs this
-
-options        RTC_OFFSET=0    # hardware clock is this many mins. west of GMT
-options        NTP             # NTP phase/frequency locked loop
-
-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
-#options       SYSVSHM         # System V-like memory sharing
-
-options        MODULAR         # new style module(7) framework
-options        MODULAR_DEFAULT_AUTOLOAD
-options        USERCONF        # userconf(4) support
-#options       PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-options        SYSCTL_INCLUDE_DESCR    # Include sysctl descriptions in kernel
-
-# CPU-related options
-options        SVS             # Separate Virtual Space
-makeoptions    SPECTRE_V2_GCC_MITIGATION=1     # GCC Spectre variant 2
-                                               # migitation
-options        SPECTRE_V2_GCC_MITIGATION
-
-# USER_LDT. You need to disable SVS to use it.
-#options       USER_LDT        # user-settable LDT; used by WINE
-#no options    SVS
-
-# CPU features
-acpicpu*       at cpu?         # ACPI CPU (including frequency scaling)
-coretemp*      at cpu?         # Intel on-die thermal sensor
-est0           at cpu0         # Intel Enhanced SpeedStep (non-ACPI)
-#odcm0         at cpu0         # On-demand clock modulation
-powernow0      at cpu0         # AMD PowerNow! and Cool'n'Quiet (non-ACPI)
-vmt0           at cpu0         # VMware Tools
-
-# Alternate buffer queue strategies for better responsiveness under high
-# disk I/O load.
-#options       BUFQ_READPRIO
-options        BUFQ_PRIOCSCAN
-
-# Diagnostic/debugging support options
-options        DIAGNOSTIC      # inexpensive kernel consistency checks
-                               # XXX to be commented out on release branch
-#options       DEBUG           # expensive debugging checks/support
-#options       LOCKDEBUG       # expensive locking checks/support
-
-#
-# Because gcc omits the frame pointer for any -O level, the line below
-# is needed to make backtraces in DDB work.
-#
-makeoptions    COPTS="-O2 -fno-omit-frame-pointer"
-options        DDB             # in-kernel debugger
-#options       DDB_COMMANDONENTER="bt" # execute command when ddb is entered
-#options       DDB_ONPANIC=1   # see also sysctl(7): `ddb.onpanic'
-options        DDB_HISTORY_SIZE=512    # enable history editing in DDB
-#options       KGDB            # remote debugger
-#options       KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
-makeoptions    DEBUG="-g"      # compile full symbol table for CTF
-#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 Address Sanitizer (kASan). You need to disable SVS to use it.
-#makeoptions   KASAN=1         # Kernel Address Sanitizer
-#options       KASAN
-#no options    SVS
-
-# Kernel Info Leak Detector.
-#makeoptions   KLEAK=1
-#options       KLEAK
-
-# Compatibility options
-# x86_64 never shipped with a.out binaries; the two options below are
-# only relevant to 32-bit i386 binaries
-#options       EXEC_AOUT       # required by binaries from before 1.5
-#options       COMPAT_NOMID    # NetBSD 0.8, 386BSD, and BSDI
-
-# NetBSD backward compatibility. Support goes from COMPAT_15 up until
-# the latest release. Note that really old compat (< COMPAT_16) is only
-# useful for 32-bit i386 binaries.
-#include       "conf/compat_netbsd15.config"
-
-#options       COMPAT_386BSD_MBRPART # recognize old partition ID
-
-#options       COMPAT_OSSAUDIO
-#options       COMPAT_NETBSD32
-#options       COMPAT_LINUX
-#options       COMPAT_LINUX32  # requires COMPAT_LINUX and COMPAT_NETBSD32
-                               # and COMPAT_50 (or older)
-#options       EXEC_ELF32      # requires COMPAT_NETBSD32
-
-# Wedge support
-options        DKWEDGE_AUTODISCOVER    # Automatically add dk(4) instances
-options        DKWEDGE_METHOD_GPT      # Supports GPT partitions as wedges
-#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
-#options       DKWEDGE_METHOD_RDB      # Support RDB partitions as wedges
-
-# File systems
-file-system    FFS             # UFS
-file-system    MFS             # memory file system
-file-system    NFS             # Network File System client
-file-system    TMPFS           # Efficient memory file-system
-file-system    EXT2FS          # second extended file system (linux)
-file-system    LFS             # log-structured 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    PUFFS           # Userspace file systems (e.g. ntfs-3g & sshfs)
-file-system    SMBFS           # experimental - CIFS; also needs nsmb (below)
-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    PTYFS           # /dev/ptm support
-#file-system   UDF             # experimental - OSTA UDF CD/DVD file-system
-#file-system   HFS             # experimental - Apple HFS+ (read-only)
-#file-system   NILFS           # experimental - NTT's NiLFS(2)
-#file-system   AUTOFS          # experimental - Automounter Filesystem
-
-# File system options
-# ffs
-options        QUOTA           # legacy UFS quotas
-options        QUOTA2          # new, in-filesystem UFS quotas
-options        FFS_EI          # FFS Endian Independent support
-options        WAPBL           # File system journaling support
-# Note that UFS_DIRHASH is suspected of causing kernel memory corruption.
-# It is not recommended for general use.
-#options       UFS_DIRHASH     # UFS Large Directory Hashing - Experimental
-#options       FFS_NO_SNAPSHOT # No FFS snapshot support
-options        UFS_EXTATTR     # Extended attribute support for UFS1
-# ext2fs
-#options       EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
-                               # immutable) behave as system flags.
-# other
-#options       DISKLABEL_EI    # disklabel Endian Independent support
-options        NFSSERVER       # Network File System server
-
-# Networking options
-#options       GATEWAY         # packet forwarding
-options        INET            # IP + ICMP + TCP + UDP
-options        INET6           # IPV6
-options        IPSEC           # IP security
-#options       IPSEC_DEBUG     # debug for IP security
-#options       MPLS            # MultiProtocol Label Switching (needs mpls)
-#options       MROUTING        # IP multicast routing
-#options       PIM             # Protocol Independent Multicast
-options        NETATALK        # AppleTalk networking protocols
-#options       CAN             # Controller Area Network protocol
-options        PPP_BSDCOMP     # BSD-Compress compression support for PPP
-options        PPP_DEFLATE     # Deflate compression support for PPP
-options        PPP_FILTER      # Active filter support for PPP (requires bpf)
-#options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
-#options       TCP_SIGNATURE   # Enable RFC-2385 TCP md5 signatures
-
-#options       ALTQ            # Manipulate network interfaces' output queues
-#options       ALTQ_BLUE       # Stochastic Fair Blue
-#options       ALTQ_CBQ        # Class-Based Queueing
-#options       ALTQ_CDNR       # Diffserv Traffic Conditioner
-#options       ALTQ_FIFOQ      # First-In First-Out Queue
-#options       ALTQ_FLOWVALVE  # RED/flow-valve (red-penalty-box)
-#options       ALTQ_HFSC       # Hierarchical Fair Service Curve
-#options       ALTQ_LOCALQ     # Local queueing discipline
-#options       ALTQ_PRIQ       # Priority Queueing
-#options       ALTQ_RED        # Random Early Detection
-#options       ALTQ_RIO        # RED with IN/OUT
-#options       ALTQ_WFQ        # Weighted Fair Queueing
-
-# These options enable verbose messages for several subsystems.
-# Warning, these may compile large string tables into the kernel!
-#options       ACPIVERBOSE     # verbose ACPI configuration messages
-#options       MIIVERBOSE      # verbose PHY autoconfig messages
-#options       PCIVERBOSE      # verbose PCI device autoconfig messages
-#options       PCI_CONFIG_DUMP # verbosely dump PCI config space
-#options       PCMCIAVERBOSE   # verbose PCMCIA configuration messages
-options        SCSIVERBOSE     # human readable SCSI error messages
-#options       USBVERBOSE      # verbose USB device autoconfig messages
-#options       HDAUDIOVERBOSE  # verbose HDAUDIO driver messages
-
-options        NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
-
-#
-# wscons options
-#
-# builtin terminal emulations
-options        WSEMUL_VT100            # VT100 / VT220 emulation
-#options       WSEMUL_SUN              # sun terminal emulation
-#options       WSEMUL_DEFAULT="\"vt100\""  # NB: default is "sun" if enabled
-# different kernel output - see dev/wscons/wsdisplayvar.h
-options        WS_KERNEL_FG=WSCOL_GREEN
-#options       WS_KERNEL_BG=WSCOL_BLACK
-# compatibility to other console drivers
-options        WSDISPLAY_COMPAT_PCVT           # emulate some ioctls
-options        WSDISPLAY_COMPAT_SYSCONS        # emulate some ioctls
-options        WSDISPLAY_COMPAT_USL            # wsconscfg VT handling
-options        WSDISPLAY_COMPAT_RAWKBD         # can get raw scancodes
-# don't attach pckbd as the console if no PS/2 keyboard is found
-options        PCKBD_CNATTACH_MAY_FAIL
-# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
-#options       PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
-# allocate a number of virtual screens at autoconfiguration time
-#options       WSDISPLAY_DEFAULTSCREENS=4
-# use a large software cursor that doesn't blink
-options        PCDISPLAY_SOFTCURSOR
-# modify the screen type of the console; defaults to "80x25"
-#options       VGA_CONSOLE_SCREENTYPE="\"80x24\""
-# work around a hardware bug that loaded fonts don't work; found on ATI cards
-#options       VGA_CONSOLE_ATI_BROKEN_FONTSEL
-# console scrolling support.
-options        WSDISPLAY_SCROLLSUPPORT
-# enable VGA raster mode capable of displaying multilingual text on console
-#options       VGA_RASTERCONSOLE
-# enable splash screen support; requires genfb or radeonfb
-#options       SPLASHSCREEN
-
-# Kernel root file system and dump configuration.
-config         netbsd  root on ? type ?
-#config                netbsd  root on sd0a type ffs
-#config                netbsd  root on ? type nfs
-
-#
-# Device configuration
-#
-
-#IPMI support
-ipmi0          at mainbus?
-ipmi_acpi*     at acpi?
-ipmi0          at ipmi_acpi?
+include "arch/amd64/conf/GENERIC"
 
-# ACPI will be used if present. If not it will fall back to MPBIOS



Home | Main Index | Thread Index | Old Index