Tue Dec 9 13:16:22 2008 UTC ()
Sync PCMCIA and CardBus devices with i386/conf/GENERIC.


(nakayama)
diff -r1.106 -r1.107 src/sys/arch/sparc64/conf/GENERIC
cvs diff -r1.106 -r1.107 src/sys/arch/sparc64/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/sparc64/conf/GENERIC 2008/11/24 11:41:14 1.106
+++ src/sys/arch/sparc64/conf/GENERIC 2008/12/09 13:16:22 1.107
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.106 2008/11/24 11:41:14 ad Exp $ 1# $NetBSD: GENERIC,v 1.107 2008/12/09 13:16:22 nakayama Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/sparc64/conf/std.sparc64" 21include "arch/sparc64/conf/std.sparc64"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.106 $" 25#ident "GENERIC-$Revision: 1.107 $"
26 26
27maxusers 64 27maxusers 64
28 28
29## System kernel configuration. See options(4) for more detail. 29## System kernel configuration. See options(4) for more detail.
30 30
31 31
32# Options for variants of the Sun SPARC architecure. 32# Options for variants of the Sun SPARC architecure.
33# We currently support three architecture types; at least one is required. 33# We currently support three architecture types; at least one is required.
34options SUN4U # sun4u - UltraSPARC 34options SUN4U # sun4u - UltraSPARC
35#options BLINK # blink the system LED 35#options BLINK # blink the system LED
36 36
37#### System options that are the same for all ports 37#### System options that are the same for all ports
38 38
@@ -536,29 +536,26 @@ nsphyter* at mii? phy ? # NS83843 PHYs @@ -536,29 +536,26 @@ nsphyter* at mii? phy ? # NS83843 PHYs
536qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs 536qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
537rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs 537rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs
538rlphy* at mii? phy ? # Realtek 8139/8201L PHYs 538rlphy* at mii? phy ? # Realtek 8139/8201L PHYs
539sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs 539sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
540tlphy* at mii? phy ? # ThunderLAN PHYs 540tlphy* at mii? phy ? # ThunderLAN PHYs
541tqphy* at mii? phy ? # TDK Semiconductor PHYs 541tqphy* at mii? phy ? # TDK Semiconductor PHYs
542ukphy* at mii? phy ? # generic unknown PHYs 542ukphy* at mii? phy ? # generic unknown PHYs
543 543
544# PCI USB controllers 544# PCI USB controllers
545ehci* at pci? dev ? function ? # Enhanced Host Controller 545ehci* at pci? dev ? function ? # Enhanced Host Controller
546ohci* at pci? dev ? function ? # Open Host Controller 546ohci* at pci? dev ? function ? # Open Host Controller
547uhci* at pci? dev ? function ? # Universal Host Controller (Intel) 547uhci* at pci? dev ? function ? # Universal Host Controller (Intel)
548 548
549# PCMCIA USB controllers 
550#slhci* at pcmcia? function ? # ScanLogic SL811HS 
551 
552# USB bus support 549# USB bus support
553usb* at ehci? 550usb* at ehci?
554usb* at ohci? 551usb* at ohci?
555usb* at uhci? 552usb* at uhci?
556#usb* at slhci? 553#usb* at slhci?
557 554
558# USB Hubs 555# USB Hubs
559uhub* at usb? 556uhub* at usb?
560uhub* at uhub? port ? 557uhub* at uhub? port ?
561 558
562# USB HID device 559# USB HID device
563uhidev* at uhub? port ? configuration ? interface ? 560uhidev* at uhub? port ? configuration ? interface ?
564 561
@@ -737,32 +734,35 @@ pseudo-device stf # 6to4 IPv6 over IPv @@ -737,32 +734,35 @@ pseudo-device stf # 6to4 IPv6 over IPv
737#adv* at cardbus? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI UT 734#adv* at cardbus? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI UT
738#ahc* at cardbus? function ? # Adaptec ADP-1480 UT 735#ahc* at cardbus? function ? # Adaptec ADP-1480 UT
739#njs* at cardbus? function ? # Workbit NinjaSCSI-32 736#njs* at cardbus? function ? # Workbit NinjaSCSI-32
740 737
741# CardBus IDE controllers 738# CardBus IDE controllers
742#njata* at cardbus? function ? flags 0x01 # Workbit NinjaATA-32 739#njata* at cardbus? function ? flags 0x01 # Workbit NinjaATA-32
743 740
744# CardBus network interfaces 741# CardBus network interfaces
745#ath* at cardbus? function ? # Atheros 5210/5211/5212 802.11 742#ath* at cardbus? function ? # Atheros 5210/5211/5212 802.11
746#atw* at cardbus? function ? # ADMtek ADM8211 (802.11) UT 743#atw* at cardbus? function ? # ADMtek ADM8211 (802.11) UT
747#ex* at cardbus? function ? # 3Com 3C575TX 744#ex* at cardbus? function ? # 3Com 3C575TX
748#fxp* at cardbus? function ? # Intel i8255x UT 745#fxp* at cardbus? function ? # Intel i8255x UT
749#ral* at cardbus? function ? # Ralink Technology RT25x0 802.11a/b/g UT 746#ral* at cardbus? function ? # Ralink Technology RT25x0 802.11a/b/g UT
 747#re* at cardbus? function ? # Realtek 8139C+/8169/8169S/8110S UT
750#rtk* at cardbus? function ? # Realtek 8129/8139 UT 748#rtk* at cardbus? function ? # Realtek 8129/8139 UT
 749#rtw* at cardbus? function ? # Realtek 8180L (802.11) UT
751#tlp* at cardbus? function ? # DECchip 21143 750#tlp* at cardbus? function ? # DECchip 21143
752 751
753# CardBus USB controllers 752# CardBus USB controllers
754#ehci* at cardbus? function ? # Enhanced Host Controller 753#ehci* at cardbus? function ? # Enhanced Host Controller
755#ohci* at cardbus? function ? # Open Host Controller 754#ohci* at cardbus? function ? # Open Host Controller
 755#uhci* at cardbus? function ? # Universal Host Controller (Intel) UT
756 756
757## PCMCIA cards; UT marks untested. 757## PCMCIA cards; UT marks untested.
758 758
759# PCMCIA serial interfaces 759# PCMCIA serial interfaces
760#com* at pcmcia? function ? # Modems and serial cards 760#com* at pcmcia? function ? # Modems and serial cards
761 761
762#pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards UT 762#pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards UT
763#com* at pcmcom? slave ? # ...and the slave devices 763#com* at pcmcom? slave ? # ...and the slave devices
764 764
765# PCMCIA SCSI controllers 765# PCMCIA SCSI controllers
766#aic* at pcmcia? function ? # Adaptec APA-1460 SCSI UT 766#aic* at pcmcia? function ? # Adaptec APA-1460 SCSI UT
767#esp* at pcmcia? function ? # Qlogic ESP406/FAS408 SCSI UT 767#esp* at pcmcia? function ? # Qlogic ESP406/FAS408 SCSI UT
768#spc* at pcmcia? function ? # Fujitsu MB87030/MB89352 SCSI 768#spc* at pcmcia? function ? # Fujitsu MB87030/MB89352 SCSI
@@ -780,28 +780,28 @@ pseudo-device stf # 6to4 IPv6 over IPv @@ -780,28 +780,28 @@ pseudo-device stf # 6to4 IPv6 over IPv
780#ne* at pcmcia? function ? # NE2000-compatible Ethernet 780#ne* at pcmcia? function ? # NE2000-compatible Ethernet
781#ray* at pcmcia? function ? # Raytheon Raylink (802.11) UT 781#ray* at pcmcia? function ? # Raytheon Raylink (802.11) UT
782#sm* at pcmcia? function ? # Megahertz Ethernet UT 782#sm* at pcmcia? function ? # Megahertz Ethernet UT
783# tr at pcmcia has problems with Cardbus bridges 783# tr at pcmcia has problems with Cardbus bridges
784#tr* at pcmcia? function ? # TROPIC based Token-Ring UT 784#tr* at pcmcia? function ? # TROPIC based Token-Ring UT
785#wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11) 785#wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
786#xirc* at pcmcia? function ? # Xircom CreditCard Ethernet UT 786#xirc* at pcmcia? function ? # Xircom CreditCard Ethernet UT
787#com* at xirc? 787#com* at xirc?
788#xi* at xirc? 788#xi* at xirc?
789#mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards 789#mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards
790#com* at mhzc? 790#com* at mhzc?
791#sm* at mhzc? 791#sm* at mhzc?
792 792
793# PCMCIA audio devices 793# PCMCIA USB controllers
794#esl* at pcmcia? function ? # ESS 1688 AudioDrive UT 794#slhci* at pcmcia? function ? # ScanLogic SL811HS UT
795 795
796#### Bluetooth Controller and Device support 796#### Bluetooth Controller and Device support
797 797
798## Bluetooth PCMCIA Controllers 798## Bluetooth PCMCIA Controllers
799#bt3c* at pcmcia? function ? # 3Com 3CRWB6096-A 799#bt3c* at pcmcia? function ? # 3Com 3CRWB6096-A
800#btbc* at pcmcia? function ? # AnyCom BlueCard LSE041/039/139 800#btbc* at pcmcia? function ? # AnyCom BlueCard LSE041/039/139
801 801
802## Bluetooth USB Controllers 802## Bluetooth USB Controllers
803ubt* at uhub? port ? 803ubt* at uhub? port ?
804 804
805## Bluetooth Device Hub 805## Bluetooth Device Hub
806#bthub* at bcsp? 806#bthub* at bcsp?
807#bthub* at bt3c? 807#bthub* at bt3c?