Module Name:src
Committed By: riastradh
Date: Thu Jan 30 17:18:15 UTC 2014
Modified Files:
src/sys/arch/amd64/conf [riastradh-drm2]: NO_DRM
Added Files:
src/sys/arch/amd64/conf [riastradh-drm2]: DRMKMS
Log Message:
Redo amd64/NO_DRM config and add amd64/DRMKMS.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 src/sys/arch/amd64/conf/DRMKMS
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/amd64/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/amd64/conf/NO_DRM
diff -u src/sys/arch/amd64/conf/NO_DRM:1.1.2.2 src/sys/arch/amd64/conf/NO_DRM:1.1.2.3
--- src/sys/arch/amd64/conf/NO_DRM:1.1.2.2 Wed Jan 29 19:46:51 2014
+++ src/sys/arch/amd64/conf/NO_DRM Thu Jan 30 17:18:15 2014
@@ -1,1275 +1,11 @@
-# $NetBSD: NO_DRM,v 1.1.2.2 2014/01/29 19:46:51 riastradh 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/GENERIC"
-include "arch/amd64/conf/std.amd64"
-
-options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-
-#ident "GENERIC-$Revision: 1.1.2.2 $"
-
-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 USERCONF # userconf(4) support
-#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
-
-# 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 # expensive kernel consistency checks
-# XXX to be commented out on release branch
-#options DEBUG # expensive debugging checks/support
-#options LOCKDEBUG # expensive locking checks/support
-#options KMEMSTATS # kernel memory statistics (vmstat -m)
-
-#
-# 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-p
