Author: marius
Date: Wed Jun 24 20:49:02 2009
New Revision: 194901
URL: http://svn.freebsd.org/changeset/base/194901
Log:
o merge from amd64:
- r187144: Add a reference to the config(5) manpage and
to the "env" kernel config option.
- Add/enable the default USB drivers. Originally the USB
controller and keyboard drivers were disabled as these
interacted badly with the Open Firmware console driver,
i.e. caused the keyboard to not work with ofw_console(4).
Even when switch to uart(4) and the frame buffer drivers
most of the USB drivers still were kept disabled as
several of them, amongst others all of the drivers for
USB Ethernet controllers, weren't endian clean. With the
new USB stack these problem should be gone now so there's
no longer a reason to not include the same set of USB
drivers amd64 does.
o Remove the commented out device ofw_console; apart from it
being currently broken by some TTY changes one really needs
to know how to actually enable and make it work correctly.
Modified:
head/sys/sparc64/conf/GENERIC
Modified: head/sys/sparc64/conf/GENERIC
==============================================================================
--- head/sys/sparc64/conf/GENERIC Wed Jun 24 20:43:51 2009
(r194900)
+++ head/sys/sparc64/conf/GENERIC Wed Jun 24 20:49:02 2009
(r194901)
@@ -1,8 +1,8 @@
#
# GENERIC -- Generic kernel configuration file for FreeBSD/sparc64
#
-# For more information on this file, please read the handbook section on
-# Kernel Configuration Files:
+# For more information on this file, please read the config(5) manual page,
+# and/or the handbook section on Kernel Configuration Files:
#
#
http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
#
@@ -16,8 +16,6 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# For hardware specific information check HARDWARE.TXT
-#
# $FreeBSD$
cpu SUN4U
@@ -26,6 +24,12 @@ ident GENERIC
# To statically compile in device wiring instead of /boot/device.hints
#hints "GENERIC.hints" # Default places to look for devices.
+# Use the following to compile in values accessible to the kernel
+# through getenv() (or kenv(1) in userland). The format of the file
+# is 'variable=value', see kenv(1)
+#
+# env "GENERIC.env"
+
makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
# Platforms supported
@@ -76,7 +80,7 @@ options INVARIANT_SUPPORT # Extra sanit
options WITNESS # Enable checks to detect deadlocks and
cycles
options WITNESS_SKIPSPIN # Don't run witness on spinlocks for
speed
-# To make an SMP kernel, the next line is needed
+# Make an SMP-capable kernel by default
options SMP # Symmetric MultiProcessor Kernel
# Standard busses
@@ -138,8 +142,6 @@ device machfb # ATI Mach64 framebuffer
device splash # Splash screen and screen saver support
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
-#device ofw_console # Open Firmware console device
-
# Builtin hardware
device auxio # auxiliary I/O device
device eeprom # eeprom (really a front-end for the MK48Txx)
@@ -201,6 +203,7 @@ options IEEE80211_AMPDU_AGE # age frame
device wlan_wep # 802.11 WEP support
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
+device wlan_amrr # AMRR transmit rate control algorithm
device ath # Atheros pci/cardbus NIC's
device ath_hal # Atheros HAL (Hardware Access Layer)
options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
@@ -223,23 +226,38 @@ device firmware # firmware assist modul
device bpf # Berkeley packet filter
# USB support
-#device uhci # UHCI PCI->USB interface
+device uhci # UHCI PCI->USB interface
device ohci # OHCI PCI->USB interface
+device ehci # EHCI PCI->USB interface (USB 2.0)
device usb # USB Bus (required)
#device udbp # USB Double Bulk Pipe devices
-#device uhid # "Human Interface Devices"
+device uhid # "Human Interface Devices"
device ukbd # Keyboard
-#device ulpt # Printer
-#device umass # Disks/Mass storage - Requires scbus
and da
+device ulpt # Printer
+device umass # Disks/Mass storage - Requires scbus and da
device ums # Mouse
-#device urio # Diamond Rio 500 MP3 player
-# USB Ethernet, requires mii
-#device aue # ADMtek USB Ethernet
-#device axe # ASIX Electronics USB Ethernet
-#device cdce # Generic USB over Ethernet
-#device cue # CATC USB Ethernet
-#device kue # Kawasaki LSI USB Ethernet
-#device rue # RealTek RTL8150 USB Ethernet
+device rum # Ralink Technology RT2501USB wireless NICs
+device uath # Atheros AR5523 wireless NICs
+device ural # Ralink Technology RT2500USB wireless NICs
+device zyd # ZyDAS zb1211/zb1211b wireless NICs
+device urio # Diamond Rio 500 MP3 player
+# USB Serial devices
+device uark # Technologies ARK3116 based serial adapters
+device ubsa # Belkin F5U103 and compatible serial adapters
+device uftdi # For FTDI usb serial adapters
+device uipaq # Some WinCE based devices
+device uplcom # Prolific PL-2303 serial adapters
+device uslcom # SI Labs CP2101/CP2102 serial adapters
+device uvisor # Visor and Palm devices
+device uvscom # USB serial support for DDI pocket's PHS
+# USB Ethernet, requires miibus
+device aue # ADMtek USB Ethernet
+device axe # ASIX Electronics USB Ethernet
+device cdce # Generic USB over Ethernet
+device cue # CATC USB Ethernet
+device kue # Kawasaki LSI USB Ethernet
+device rue # RealTek RTL8150 USB Ethernet
+device udav # Davicom DM9601E USB
# FireWire support
device firewire # FireWire bus code
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
