[Midnightbsd-cvs] src: amd64/conf:
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Sep 29 22:47:46 EDT 2008
Log Message:
-----------
Modified Files:
--------------
src/sys/amd64/conf:
DEFAULTS (r1.1 -> r1.2)
GENERIC (r1.8 -> r1.9)
GENERIC.hints (r1.1 -> r1.2)
NOTES (r1.1 -> r1.2)
-------------- next part --------------
Index: GENERIC.hints
===================================================================
RCS file: /home/cvs/src/sys/amd64/conf/GENERIC.hints,v
retrieving revision 1.1
retrieving revision 1.2
diff -L sys/amd64/conf/GENERIC.hints -L sys/amd64/conf/GENERIC.hints -u -r1.1 -r1.2
--- sys/amd64/conf/GENERIC.hints
+++ sys/amd64/conf/GENERIC.hints
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.15 2004/07/22 22:28:34 imp Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.16 2006/10/21 12:52:46 ru Exp $
hint.fdc.0.at="isa"
hint.fdc.0.port="0x3F0"
hint.fdc.0.irq="6"
@@ -11,7 +11,6 @@
hint.atkbdc.0.port="0x060"
hint.atkbd.0.at="atkbdc"
hint.atkbd.0.irq="1"
-hint.atkbd.0.flags="0x1"
hint.psm.0.at="atkbdc"
hint.psm.0.irq="12"
hint.vga.0.at="isa"
Index: GENERIC
===================================================================
RCS file: /home/cvs/src/sys/amd64/conf/GENERIC,v
retrieving revision 1.8
retrieving revision 1.9
diff -L sys/amd64/conf/GENERIC -L sys/amd64/conf/GENERIC -u -r1.8 -r1.9
--- sys/amd64/conf/GENERIC
+++ sys/amd64/conf/GENERIC
@@ -14,7 +14,6 @@
# $MidnightBSD$
# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.439.2.7 2005/10/28 19:21:27 jhb Exp $
-machine amd64
cpu HAMMER
ident GENERIC
@@ -47,6 +46,7 @@
options COMPAT_IA32 # Compatible with i386 binaries
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
+options COMPAT_FREEBSD6 # Compatible with FreeBSD6
options COMPAT_LINUX32 # Compatible with i386 linux binaries
options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
Index: DEFAULTS
===================================================================
RCS file: /home/cvs/src/sys/amd64/conf/DEFAULTS,v
retrieving revision 1.1
retrieving revision 1.2
diff -L sys/amd64/conf/DEFAULTS -L sys/amd64/conf/DEFAULTS -u -r1.1 -r1.2
--- sys/amd64/conf/DEFAULTS
+++ sys/amd64/conf/DEFAULTS
@@ -1,10 +1,9 @@
#
# DEFAULTS -- Default kernel configuration file for FreeBSD/amd64
#
-# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.2.2.1 2005/10/28 19:21:27 jhb Exp $
+# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.10 2007/06/11 00:38:05 marcel Exp $
-# Not yet, this would break all existing configs
-#machine amd64
+machine amd64
# Bus support.
device isa
@@ -12,3 +11,13 @@
# Pseudo devices.
device mem # Memory and kernel memory devices
device io # I/O device
+
+# UART chips on this platform
+device uart_ns8250
+
+# Default partitioning schemes
+options GEOM_BSD
+options GEOM_MBR
+
+# KSE support went from being default to a kernel option
+options KSE
Index: NOTES
===================================================================
RCS file: /home/cvs/src/sys/amd64/conf/NOTES,v
retrieving revision 1.1
retrieving revision 1.2
diff -L sys/amd64/conf/NOTES -L sys/amd64/conf/NOTES -u -r1.1 -r1.2
--- sys/amd64/conf/NOTES
+++ sys/amd64/conf/NOTES
@@ -4,16 +4,10 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.36.2.9 2005/12/14 00:52:57 anholt Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.69.2.3.2.1 2008/02/06 03:24:29 scottl Exp $
#
#
-# This directive is mandatory; it defines the architecture to be
-# configured for; in this case, the AMD64 family based machines.
-#
-machine amd64
-
-#
# We want LINT to cover profiling as well.
profile 2
@@ -39,7 +33,7 @@
#
# Debugging options.
#
-options KDB_STOP_NMI # Stop CPUS using NMI instead of IPI
+options STOP_NMI # Stop CPUS using NMI instead of IPI
@@ -103,10 +97,51 @@
# clock to actually be used.
options CLK_USE_I8254_CALIBRATION
+# Provide read/write access to the memory in the clock chip.
+device nvram # Access to rtc cmos via /dev/nvram
+
#####################################################################
# MISCELLANEOUS DEVICES AND OPTIONS
+#
+# sio: serial ports (see sio(4)), including support for various
+# PC Card devices, such as Modem and NICs
+#
+device sio
+hint.sio.0.at="isa"
+hint.sio.0.port="0x3F8"
+hint.sio.0.flags="0x10"
+hint.sio.0.irq="4"
+
+# `flags' specific to sio(4).
+# 0x10 enable console support for this unit. Other console flags
+# (if applicable) are ignored unless this is set. Enabling
+# console support does not make the unit the preferred console.
+# Boot with -h or set boot_serial=YES in the loader. For sio(4)
+# specifically, the 0x20 flag can also be set (see above).
+# Currently, at most one unit can have console support; the
+# first one (in config file order) with this flag set is
+# preferred. Setting this flag for sio0 gives the old behaviour.
+# 0x20 force this unit to be the console (unless there is another
+# higher priority console). This replaces the COMCONSOLE option.
+# 0x40 reserve this unit for low level console operations. Do not
+# access the device in any normal way.
+# 0x80 use this port for serial line gdb support in ddb. Also known
+# as debug port.
+# PnP `flags'
+# 0x1 disable probing of this device. Used to prevent your modem
+# from being attached as a PnP modem.
+# Other flags for sio that aren't documented in the man page.
+# 0x20000 enable hardware RTS/CTS and larger FIFOs. Only works for
+# ST16650A-compatible UARTs.
+
+# Options for sio:
+options COM_ESP # Code for Hayes ESP.
+options COM_MULTIPORT # Code for some cards with shared IRQs.
+options CONSPEED=115200 # Speed for serial console
+ # (default 9600).
+
device speaker #Play IBM BASIC-style noises out your speaker
hint.speaker.0.at="isa"
hint.speaker.0.port="0x61"
@@ -170,17 +205,71 @@
# Optional devices:
#
+# PS/2 mouse
+device psm
+hint.psm.0.at="atkbdc"
+hint.psm.0.irq="12"
+
+# Options for psm:
+options PSM_HOOKRESUME #hook the system resume event, useful
+ #for some laptops
+options PSM_RESETAFTERSUSPEND #reset the device at the resume event
+
+# The keyboard controller; it controls the keyboard and the PS/2 mouse.
+device atkbdc
+hint.atkbdc.0.at="isa"
+hint.atkbdc.0.port="0x060"
+
+# The AT keyboard
+device atkbd
+hint.atkbd.0.at="atkbdc"
+hint.atkbd.0.irq="1"
+
+# Options for atkbd:
+options ATKBD_DFLT_KEYMAP # specify the built-in keymap
+makeoptions ATKBD_DFLT_KEYMAP=jp.106
+
+# `flags' for atkbd:
+# 0x01 Force detection of keyboard, else we always assume a keyboard
+# 0x02 Don't reset keyboard, useful for some newer ThinkPads
+# 0x03 Force detection and avoid reset, might help with certain
+# dockingstations
+# 0x04 Old-style (XT) keyboard support, useful for older ThinkPads
+
+# Video card driver for VGA adapters.
+device vga
+hint.vga.0.at="isa"
+
+# Options for vga:
+# Try the following option if the mouse pointer is not drawn correctly
+# or font does not seem to be loaded properly. May cause flicker on
+# some systems.
+options VGA_ALT_SEQACCESS
+
+# If you can dispense with some vga driver features, you may want to
+# use the following options to save some memory.
+#options VGA_NO_FONT_LOADING # don't save/load font
+#options VGA_NO_MODE_CHANGE # don't change video modes
+
+# Older video cards may require this option for proper operation.
+options VGA_SLOW_IOACCESS # do byte-wide i/o's to TS and GDC regs
+
+# The following option probably won't work with the LCD displays.
+options VGA_WIDTH90 # support 90 column modes
+
+# Debugging.
+options VGA_DEBUG
+
# 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create
# the /dev/3dfx0 device to work with glide implementations. This should get
# linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as
# the tdfx DRI module from XFree86 and is completely unrelated.
#
# To enable Linuxulator support, one must also include COMPAT_LINUX in the
-# config as well, or you will not have the dependencies. The other option
-# is to load both as modules.
+# config as well. The other option is to load both as modules.
device tdfx # Enable 3Dfx Voodoo support
-#XXX#options TDFX_LINUX # Enable Linuxulator support
+#XXX#device tdfx_linux # Enable Linuxulator support
#
# ACPI support using the Intel ACPI Component Architecture reference
@@ -192,18 +281,10 @@
# defined when it is built).
#
# ACPI_NO_SEMAPHORES makes the AcpiOs*Semaphore routines a no-op.
-#
-# ACPICA_PEDANTIC enables strict checking of AML. Our default is to
-# relax these checks to allow code generated by the Microsoft compiler
-# to still execute.
-#
-# Note that building ACPI into the kernel is deprecated; the module is
-# normally loaded automatically by the loader.
device acpi
options ACPI_DEBUG
#!options ACPI_NO_SEMAPHORES
-#!options ACPICA_PEDANTIC
# The cpufreq(4) driver provides support for non-ACPI CPU frequency control
device cpufreq
@@ -226,19 +307,27 @@
# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan)
# ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503
-# HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf)
+# HP PC Lan+, various PC Card devices
# (requires miibus)
-# lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and
-# Am79C960)
+# ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter
+# iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters
+# nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source)
# nve: nVidia nForce MCP on-board Ethernet Networking
-
-#XXX# still calls MD i386 kvtop function instead of vtophys etc
-#XXX#device ed
-#XXX#options ED_3C503
-#XXX#options ED_HPP
-#XXX#options ED_SIC
-#XXX#device lnc
+# ral: Ralink Technology IEEE 802.11 wireless adapter
+# ural: Ralink Technology RT2500USB IEEE 802.11 wireless adapter
+# wpi: Intel 3945ABG Wireless LAN controller
+
+device ed
+options ED_3C503
+options ED_HPP
+options ED_SIC
+device iwi
+device ipw
+device nfe # nVidia nForce MCP on-board Ethernet Networking
device nve # nVidia nForce MCP on-board Ethernet Networking
+device ral
+device ural
+device wpi
device ath
device ath_hal # Atheros HAL (includes binary component)
@@ -288,6 +377,15 @@
device hptmv
#
+# Highpoint RocketRAID. Supports RR172x, RR222x, RR2240, RR232x, RR2340,
+# RR2210, RR174x, RR2522, RR231x, RR230x.
+device hptrr
+
+#
+# Highpoint RocketRaid 3xxx series SATA RAID
+device hptiop
+
+#
# IBM (now Adaptec) ServeRAID controllers
device ips
@@ -304,9 +402,11 @@
#
# Miscellaneous hardware:
#
+# ipmi: Intelligent Platform Management Interface
+# smbios: DMI/SMBIOS entry point
+# vpd: Vital Product Data kernel interface
# cy: Cyclades serial driver
# digi: Digiboard driver
-# smbios: DMI/SMBIOS entry point
# Notes on the Specialix SI/XIO driver:
# The host card is memory, not IO mapped.
@@ -325,14 +425,13 @@
device digi_Xe
device digi_Xem
device digi_Xr
+device ipmi
# Parallel (8255 PPI) basic I/O (mode 0) port (e.g. Advantech PCL-724)
device pbio
hint.pbio.0.at="isa"
hint.pbio.0.port="0x360"
device smbios
-# sx device is i386 and pc98 only at the moment.
-device sx
-options SX_DEBUG
+device vpd
# HOT1 Xilinx 6200 card (http://www.vcc.com/)
device xrpu
@@ -352,6 +451,13 @@
#
device ichwd
+#
+# Temperature sensors:
+#
+# coretemp: on-die sensor on Intel Core and newer CPUs
+#
+device coretemp
+
#---------------------------------------------------------------------------
# ISDN4BSD
#
@@ -448,9 +554,9 @@
#XXX#device i4bipr
#XXX#options NI4BIPR=4
# enable VJ header compression detection for ipr i/f
-options IPR_VJ
+#XXX#options IPR_VJ
# enable logging of the first n IP packets to isdnd (n=32 here)
-options IPR_LOG=32
+#XXX#options IPR_LOG=32
#
# network driver for sync PPP over ISDN; requires an equivalent
# number of sppp device to be configured
@@ -510,6 +616,10 @@
# and PSEUDOFS)
options LINPROCFS
+#Enable the linux-like sys filesystem support (requires COMPAT_LINUX32
+# and PSEUDOFS)
+options LINSYSFS
+
#
# SysVR4 ABI emulation
#
@@ -559,6 +669,6 @@
options VM_KMEM_SIZE_MAX
options VM_KMEM_SIZE_SCALE
-
-# The I/O device
-device io
+# Enable NDIS binary driver support
+options NDISAPI
+device ndis
More information about the Midnightbsd-cvs
mailing list