From 646dad29dbbb401ba4d1a0487069b07a6df8ad31 Mon Sep 17 00:00:00 2001 From: nico Date: Wed, 2 Nov 2005 22:30:28 +0000 Subject: rework the kernel menuconfig, always use prompt to display config text instead of bool/tristate git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2315 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/Config.in | 342 +++++++++++++++++--------------- target/linux/package/alsa/Config.in | 3 +- target/linux/package/diag/Config.in | 3 +- target/linux/package/fuse/Config.in | 7 +- target/linux/package/hostap/Config.in | 18 +- target/linux/package/madwifi/Config.in | 5 +- target/linux/package/mini_fo/Config.in | 5 +- target/linux/package/openswan/Config.in | 3 +- target/linux/package/shfs/Config.in | 5 +- target/linux/package/wlcompat/Config.in | 6 +- 10 files changed, 211 insertions(+), 186 deletions(-) diff --git a/target/linux/Config.in b/target/linux/Config.in index 6f4803ff7..443dca463 100644 --- a/target/linux/Config.in +++ b/target/linux/Config.in @@ -27,7 +27,7 @@ config BR2_LINUX_2_4_X86 help Build firmware images for x86 based boards (e.g. Soekris net4521 and net4801, PC Engines WRAP...) - + config BR2_LINUX_2_6_BRCM bool "Support for Broadcom based routers [2.6]" default n @@ -35,93 +35,97 @@ config BR2_LINUX_2_6_BRCM help Build firmware images for Broadcom based routers (e.g. Netgear WGT634u) - + endchoice -comment "Kernel Modules" +comment "Device specific modules" -config BR2_PACKAGE_KMOD_SANGAM_ATM_A - tristate "AR7 Sangam ADSL Driver (Annex A)" - default m - depends BR2_LINUX_2_4_AR7 - select BR2_PACKAGE_KMOD_ATM +config BR2_PACKAGE_KMOD_BRCM_ET + prompt "kmod-brcm-et...................... Broadcom Ethernet Driver" + tristate + depends BR2_LINUX_2_4_BRCM + default y help - ATM driver for the Sangam ADSL chip on AR7 - Annex A version + Proprietary driver for Broadcom Ethernet chipsets -config BR2_PACKAGE_KMOD_SANGAM_ATM_B - tristate "AR7 Sangam ADSL Driver (Annex B)" +config BR2_PACKAGE_KMOD_BRCM_WL + prompt "kmod-brcm-wl...................... Broadcom Wireless Network Driver" + tristate + depends BR2_LINUX_2_4_BRCM default y - depends BR2_LINUX_2_4_AR7 - select BR2_PACKAGE_KMOD_ATM help - ATM driver for the Sangam ADSL chip on AR7 - Annex B version + Proprietary driver for Broadcom Wireless chipsets config BR2_PACKAGE_KMOD_CPMAC - tristate "AR7 CPMAC Network Driver" + prompt "kmod-cpmac........................ AR7 CPMAC Network Driver" + tristate default y depends BR2_LINUX_2_4_AR7 help Driver for the AR7 CPMAC network chip -config BR2_PACKAGE_KMOD_BRCM_WL - tristate "Broadcom Wireless Network Driver" - depends BR2_LINUX_2_4_BRCM - default y +config BR2_PACKAGE_KMOD_SANGAM_ATM_A + prompt "kmod-sangam-atm-annex-a........... AR7 Sangam ADSL Driver (Annex A)" + tristate + default m + depends BR2_LINUX_2_4_AR7 + select BR2_PACKAGE_KMOD_ATM help - Proprietary driver for Broadcom Wireless chipsets + ATM driver for the Sangam ADSL chip on AR7 + Annex A version -config BR2_PACKAGE_KMOD_BRCM_ET - tristate "Broadcom Ethernet Driver" - depends BR2_LINUX_2_4_BRCM +config BR2_PACKAGE_KMOD_SANGAM_ATM_B + prompt "kmod-sangam-atm-annex-b........... AR7 Sangam ADSL Driver (Annex B)" + tristate default y + depends BR2_LINUX_2_4_AR7 + select BR2_PACKAGE_KMOD_ATM help - Proprietary driver for Broadcom Ethernet chipsets + ATM driver for the Sangam ADSL chip on AR7 + Annex B version -comment "Networking modules ------------" +comment "Networking modules" config BR2_PACKAGE_KMOD_ATM - tristate "kmod-atm....................... ATM support" + prompt "kmod-atm.......................... ATM support" + tristate default y if BR2_LINUX_2_4_AR7 help ATM support config BR2_PACKAGE_KMOD_GRE - tristate "kmod-gre....................... GRE tunneling driver" + prompt "kmod-gre.......................... GRE tunneling driver" + tristate default m help Kernel support for GRE tunnels config BR2_PACKAGE_KMOD_IPV6 - tristate "kmod-ipv6...................... IPv6 support" + prompt "kmod-ipv6......................... IPv6 support" + tristate default m help Kernel modules for IPv6 protocol support - + config BR2_PACKAGE_KMOD_PPP - tristate "kmod-ppp....................... PPP support" + prompt "kmod-ppp.......................... PPP support" + tristate default m help Kernel support for PPP config BR2_PACKAGE_KMOD_MPPE - tristate "kmod-mppe.................... PPP MPPE/MPPC module" + prompt "kmod-mppe....................... PPP MPPE/MPPC module" + tristate default m depends BR2_PACKAGE_KMOD_PPP select BR2_PACKAGE_KMOD_CRYPTO help Support for Microsoft PPP Encryption/Compression -config BR2_PACKAGE_KMOD_PPPOE - tristate "kmod-pppoe................... PPPoE (PPP over Ethernet) kernel support" - default m - depends BR2_PACKAGE_KMOD_PPP - help - Support for PPP over Ethernet - config BR2_PACKAGE_KMOD_PPPOATM - tristate "kmod-pppoatm................. PPPoA (PPP over ATM) kernel support" + prompt "kmod-pppoatm.................... PPPoA (PPP over ATM) kernel support" + tristate default y if BR2_LINUX_2_4_AR7 default m depends BR2_PACKAGE_KMOD_PPP @@ -129,201 +133,227 @@ config BR2_PACKAGE_KMOD_PPPOATM help Support for PPP over ATM +config BR2_PACKAGE_KMOD_PPPOE + prompt "kmod-pppoe...................... PPPoE (PPP over Ethernet) kernel support" + tristate + default m + depends BR2_PACKAGE_KMOD_PPP + help + Support for PPP over Ethernet + config BR2_PACKAGE_KMOD_SCHED - tristate "kmod-sched..................... Traffic schedulers" + prompt "kmod-sched........................ Traffic schedulers" + tristate default m help Kernel schedulers for IP traffic config BR2_PACKAGE_KMOD_TUN - tristate "kmod-tun....................... Universal TUN/TAP driver" + prompt "kmod-tun.......................... Universal TUN/TAP driver" + tristate default m help Kernel support for the TUN/TAP tunneling device - -comment "Filtering/Firewalling ---------" +comment "Filtering/Firewalling" config BR2_PACKAGE_KMOD_ARPTABLES - tristate "kmod-arptables................. ARP firewalling support" + prompt "kmod-arptables.................... ARP firewalling support" + tristate default m help Kernel modules for ARP firewalling config BR2_PACKAGE_KMOD_EBTABLES - tristate "kmod-ebtables.................. Ethernet Bridge firewalling support" + prompt "kmod-ebtables..................... Ethernet Bridge firewalling support" + tristate default m help Kernel modules for bridge firewalling config BR2_PACKAGE_KMOD_IPTABLES_V4 - tristate "kmod-iptables.................. Basic set of kernel modules for iptables" + prompt "kmod-iptables..................... Basic set of kernel modules for iptables" + tristate default y help Kernel modules for IPv4 firewalling config BR2_PACKAGE_KMOD_IPTABLES_V4_EXTRA - tristate "kmod-iptables-extra............ Extra modules for iptables" + prompt "kmod-iptables-extra............... Extra modules for iptables" + tristate default m help Extra kernel modules for IPv4 firewalling config BR2_PACKAGE_KMOD_IPTABLES_V6 - tristate "kmod-ip6tables................. Kernel modules for ip6tables" + prompt "kmod-ip6tables.................... Kernel modules for ip6tables" + tristate default m depends BR2_PACKAGE_KMOD_IPV6 help IPv6 firewalling support -comment "Block devices support ---------" +comment "Block devices support" config BR2_PACKAGE_KMOD_IDE - tristate "kmod-ide....................... IDE support" + prompt "kmod-ide.......................... IDE support" + tristate default m help Kernel modules for IDE support useful for usb mass storage devices (e.g. on WL-HDD) - config BR2_PACKAGE_KMOD_LOOP - tristate "kmod-loop...................... loop mount support" + prompt "kmod-loop......................... Loop mount support" + tristate default m help Kernel module for loop mount support - config BR2_PACKAGE_KMOD_NBD - tristate "kmod-nbd....................... network block device" + prompt "kmod-nbd.......................... Network Block Device" + tristate default m help Kernel module for network block device - -comment "Cryptographic support ---------" +comment "Cryptographic support" config BR2_PACKAGE_KMOD_CRYPTO - tristate "kmod-crypto.................... CryptoAPI modules" + prompt "kmod-crypto....................... CryptoAPI modules" + tristate default m select BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE help Kernel modules for cryptographic algorithms - -comment "Filesystems support -----------" +comment "Filesystems support" config BR2_PACKAGE_KMOD_CIFS - tristate "kmod-fs-cifs................... CIFS support" + prompt "kmod-fs-cifs...................... CIFS support" + tristate default m help Kernel modules for CIFS support - config BR2_PACKAGE_KMOD_FS_EXT2 - tristate "kmod-fs-ext2................... EXT2 filesystem support" + prompt "kmod-fs-ext2...................... EXT2 filesystem support" + tristate default m help Kernel modules for EXT2 filesystem support - config BR2_PACKAGE_KMOD_FS_EXT3 - tristate "kmod-fs-ext3................... EXT3 filesystem support" + prompt "kmod-fs-ext3...................... EXT3 filesystem support" + tristate default m help Kernel modules for EXT3 filesystem support - config BR2_PACKAGE_KMOD_FS_HFSPLUS - tristate "kmod-fs-hfsplus................ HFS+ filesystem support" + prompt "kmod-fs-hfsplus................... HFS+ filesystem support" + tristate default m help Kernel modules for HFS+ filesystem support - config BR2_PACKAGE_KMOD_FS_NFS - tristate "kmod-fs-nfs.................... NFS support" + prompt "kmod-fs-nfs....................... NFS support" + tristate default m help Kernel modules for NFS support Includes lockd, nfs and sunrpc config BR2_PACKAGE_KMOD_FS_VFAT - tristate "kmod-fs-vfat................... VFAT filesystem support" + prompt "kmod-fs-vfat...................... VFAT filesystem support" + tristate default m help Kernel modules for VFAT filesystem support useful for usb mass storage devices config BR2_PACKAGE_KMOD_FS_XFS - tristate "kmod-fs-xfs.................... XFS filesystem support" + prompt "kmod-fs-xfs....................... XFS filesystem support" + tristate default m help Kernel modules for XFS filesystem support -comment "Multimedia devices support ----" +comment "Multimedia devices support" config BR2_PACKAGE_KMOD_PWC - tristate "kmod-pwc....................... Kernel driver for USB Philips Cameras" + prompt "kmod-pwc.......................... Kernel driver for USB Philips Cameras" + tristate default m config BR2_PACKAGE_KMOD_SOUNDCORE - tristate "kmod-soundcore................. Soundcard support" + prompt "kmod-soundcore.................... Soundcard support" + tristate default n help Base support for soundcards Requires either USB soundcard support (OSS) or ALSA package to be useful config BR2_PACKAGE_KMOD_VIDEODEV - tristate "kmod-videodev.................. Video (For Linux) kernel support" + prompt "kmod-videodev..................... Video (For Linux) kernel support" + tristate default m -comment "Native Language support -------" +comment "Native Language support" -config BR2_PACKAGE_KMOD_NLS_CP437 - tristate "kmod-nls-cp437................. Codepage 437 (United States, Canada)" +config BR2_PACKAGE_KMOD_NLS_BASE + prompt "kmod-nls-base..................... Native Language support" + tristate default m - select BR2_PACKAGE_KMOD_NLS help Kernel native language support -config BR2_PACKAGE_KMOD_NLS_CP850 - tristate "kmod-nls-cp850................. Codepage 850 (Europe)" +config BR2_PACKAGE_KMOD_NLS_CP437 + prompt "kmod-nls-cp437.................. Codepage 437 (United States, Canada)" + tristate default m - select BR2_PACKAGE_KMOD_NLS + depends BR2_PACKAGE_KMOD_NLS_BASE help Kernel native language support -config BR2_PACKAGE_KMOD_NLS_IS08859_1 - tristate "kmod-nls-iso8859-1............. NLS ISO 8859-1 (Latin 1; Western European Languages)" +config BR2_PACKAGE_KMOD_NLS_CP850 + prompt "kmod-nls-cp850.................. Codepage 850 (Europe)" + tristate default m - select BR2_PACKAGE_KMOD_NLS + depends BR2_PACKAGE_KMOD_NLS_BASE help Kernel native language support -config BR2_PACKAGE_KMOD_NLS_IS08859_15 - tristate "kmod-nls-iso8859-15............ NLS ISO 8859-15 (Latin 15; Western European Languages with Euro)" +config BR2_PACKAGE_KMOD_NLS_ISO8859_1 + prompt "kmod-nls-iso8859-1.............. NLS ISO 8859-1 (Latin 1; Western European Languages)" + tristate default m - select BR2_PACKAGE_KMOD_NLS + depends BR2_PACKAGE_KMOD_NLS_BASE help Kernel native language support -config BR2_PACKAGE_KMOD_NLS_UTF8 - tristate "kmod-nls-utf8.................. NLS UTF8" +config BR2_PACKAGE_KMOD_NLS_ISO8859_15 + prompt "kmod-nls-iso8859-15............. NLS ISO 8859-15 (Latin 15; Western European Languages with Euro)" + tristate default m - select BR2_PACKAGE_KMOD_NLS + depends BR2_PACKAGE_KMOD_NLS_BASE help Kernel native language support -config BR2_PACKAGE_KMOD_NLS +config BR2_PACKAGE_KMOD_NLS_UTF8 + prompt "kmod-nls-utf8................... NLS UTF8" tristate default m - depends BR2_PACKAGE_KMOD_NLS_CP437 || BR2_PACKAGE_KMOD_NLS_CP850 || BR2_PACKAGE_KMOD_NLS_IS08859_1 || BR2_PACKAGE_KMOD_NLS_IS08859_15 || BR2_PACKAGE_KMOD_NLS_UTF8 + depends BR2_PACKAGE_KMOD_NLS_BASE help Kernel native language support -comment "Network devices support -------" +comment "Network devices support" config BR2_PACKAGE_KMOD_NET_3C59X - tristate "kmod-net-3C59x................. 3Com 3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" Ethernet kernel support" + prompt "kmod-net-3C59x.................... 3Com 3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" Ethernet kernel support" + tristate default m help This option enables driver support for a large number of 10mbps and @@ -334,22 +364,18 @@ config BR2_PACKAGE_KMOD_NET_3C59X * "Cyclone" (3c540/3c900/3c905/3c980/3c575/3c656) PCI and Cardbus * "Tornado" (3c905) PCI * "Hurricane" (3c555/3cSOHO) PCI - - This package contains the 3c59x.o kernel module. - config BR2_PACKAGE_KMOD_NET_8139TOO - tristate "kmod-net-8139too............... RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support" + prompt "kmod-net-8139too.................. RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support" + tristate default m help This is a driver for the Fast Ethernet PCI network cards based on the RTL8139 chips. - - This package contains the 8139too.o and mii.o kernel modules. - config BR2_PACKAGE_KMOD_NET_AIRO - tristate "kmod-net-airo.................. Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards kernel support" + prompt "kmod-net-airo..................... Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards kernel support" + tristate default m help This is the standard Linux driver to support Cisco/Aironet ISA and @@ -361,26 +387,25 @@ config BR2_PACKAGE_KMOD_NET_AIRO This driver support both the standard Linux Wireless Extensions and Cisco proprietary API, so both the Linux Wireless Tools and the Cisco Linux utilities can be used to configure the card. - - This package contains the airo.o kernel module. - config BR2_PACKAGE_KMOD_E100 - tristate "kmod-net-e100.................. Intel(R) PRO/100+ cards kernel support" + prompt "kmod-net-e100..................... Intel(R) PRO/100+ cards kernel support" + tristate default m help Intel(R) PRO/100+ cards kernel support config BR2_PACKAGE_KMOD_B44 - tristate "kmod-net-b44................... Broadcom 44XX, 47XX ethernet driver" + prompt "kmod-net-b44...................... Broadcom 44XX, 47XX ethernet driver" + tristate default m default y if BR2_LINUX_2_6_BRCM help Free driver for Broadcom Ethernet chipsets (without switch support) - config BR2_PACKAGE_KMOD_NET_HERMES - tristate "kmod-net-hermes................ Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) kernel support" + prompt "kmod-net-hermes................... Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) kernel support" + tristate default m help A driver for 802.11b wireless cards based based on the "Hermes" or @@ -392,12 +417,10 @@ config BR2_PACKAGE_KMOD_NET_HERMES IBM High Rate Wireless, Farralon Syyline, Samsung MagicLAN, Netgear MA401, LinkSys WPC-11, D-Link DWL-650, 3Com AirConnect, Intel PRO/Wireless, and Symbol Spectrum24 High Rate amongst others. - - This package contains the hermes.o and orinoco.o kernel modules. - config BR2_PACKAGE_KMOD_NET_HERMES_PCI - tristate "kmod-net-hermes-pci.......... Intersil Prism 2.5 PCI 802.11b adaptor support" + prompt "kmod-net-hermes-pci............. Intersil Prism 2.5 PCI 802.11b adaptor support" + tristate default m depends BR2_PACKAGE_KMOD_NET_HERMES help @@ -406,12 +429,10 @@ config BR2_PACKAGE_KMOD_NET_HERMES_PCI PCMCIA cards bundled with PCI<->PCMCIA adaptors which are also common. Some of the built-in wireless adaptors in laptops are of this variety. - - This package contains the orinoco_pci.o kernel module. - config BR2_PACKAGE_KMOD_NET_HERMES_PLX - tristate "kmod-net-hermes-plx.......... Hermes in PLX9052 based PCI adaptor (Netgear MA301, etc.) kernel support" + prompt "kmod-net-hermes-plx............. Hermes in PLX9052 based PCI adaptor (Netgear MA301, etc.) kernel support" + tristate default m depends BR2_PACKAGE_KMOD_NET_HERMES help @@ -421,23 +442,19 @@ config BR2_PACKAGE_KMOD_NET_HERMES_PLX PCI <-> PCMCIA bridge. Several vendors sell such adaptors so that 802.11b PCMCIA cards can be used in desktop machines. The Netgear MA301 is such an adaptor. - - This package contains the orinoco_plx.o kernel module. - config BR2_PACKAGE_KMOD_NET_NATSEMI - tristate "kmod-net-natsemi............... National Semiconductor DP8381x series PCI Ethernet kernel support" + prompt "kmod-net-natsemi.................. National Semiconductor DP8381x series PCI Ethernet kernel support" + tristate default m help This driver is for the National Semiconductor DP83810 series, which is used in cards from PureData, NetGear, Linksys and others, including the 83815 chip. - - This package contains the natsemi.o kernel module. - config BR2_PACKAGE_KMOD_NET_PRISM54 - tristate "kmod-net-prism54............... Intersil Prism GT/Duette/Indigo PCI/PCMCIA cards kernel support" + prompt "kmod-net-prism54.................. Intersil Prism GT/Duette/Indigo PCI/PCMCIA cards kernel support" + tristate default m help Enable PCI and Cardbus support for the following chipset based cards: @@ -472,36 +489,38 @@ config BR2_PACKAGE_KMOD_NET_PRISM54 . Note: You need a motherboard with DMA support to use any of these cards. - - This package contains the prism54.o kernel module. - -comment "PCMCIA/CardBus support --------" +comment "PCMCIA/CardBus support" config BR2_PACKAGE_KMOD_PCMCIA_CORE - tristate "kmod-pcmcia-core............... PCMCIA/CardBus support" + prompt "kmod-pcmcia-core.................. PCMCIA/CardBus support" + tristate default m -comment "USB support -------------------" +comment "USB support" config BR2_PACKAGE_KMOD_USB - tristate "kmod-usb-core.................. USB support" + prompt "kmod-usb-core..................... USB support" + tristate default m config BR2_PACKAGE_KMOD_USB_UHCI - tristate "kmod-usb-uhci................ Support for UHCI controllers" + prompt "kmod-usb-uhci................... Support for UHCI controllers" + tristate default m depends BR2_PACKAGE_KMOD_USB select BR2_PACKAGE_KMOD_USB_CONTROLLER config BR2_PACKAGE_KMOD_USB_OHCI - tristate "kmod-usb-ohci................ Support for OHCI controllers" + prompt "kmod-usb-ohci................... Support for OHCI controllers" + tristate default m depends BR2_PACKAGE_KMOD_USB select BR2_PACKAGE_KMOD_USB_CONTROLLER config BR2_PACKAGE_KMOD_USB2 - tristate "kmod-usb2.................... Support for USB 2.0 controllers" + prompt "kmod-usb2....................... Support for USB 2.0 controllers" + tristate default m depends BR2_PACKAGE_KMOD_USB select BR2_PACKAGE_KMOD_USB_CONTROLLER @@ -512,85 +531,94 @@ config BR2_PACKAGE_KMOD_USB_CONTROLLER default n config BR2_PACKAGE_KMOD_USB_ACM - tristate "kmod-usb-acm................... Support for USB modems/isdn controllers" + prompt "kmod-usb-acm...................... Support for USB modems/isdn controllers" + tristate default m depends BR2_PACKAGE_KMOD_USB_CONTROLLER config BR2_PACKAGE_KMOD_USB_AUDIO - tristate "kmod-usb-audio................. Support for USB soundcards" + prompt "kmod-usb-audio.................... Support for USB soundcards" + tristate default m depends BR2_PACKAGE_KMOD_USB_CONTROLLER select BR2_PACKAGE_KMOD_SOUNDCORE config BR2_PACKAGE_KMOD_USB_PRINTER - tristate "kmod-usb-printer............... Support for USB printers" + prompt "kmod-usb-printer.................. Support for USB printers" + tristate default m depends BR2_PACKAGE_KMOD_USB_CONTROLLER config BR2_PACKAGE_KMOD_USB_SERIAL - tristate "kmod-usb-serial................ Support for USB-to-serial converters" + prompt "kmod-usb-serial................... Support for USB-to-serial converters" + tristate default m depends BR2_PACKAGE_KMOD_USB_CONTROLLER config BR2_PACKAGE_KMOD_USB_SERIAL_BELKIN - tristate "kmod-usb-serial-belkin....... Support for Belkin USB-to-serial converters" + prompt "kmod-usb-serial-belkin.......... Support for Belkin USB-to-serial converters" + tristate default m depends BR2_PACKAGE_KMOD_USB_SERIAL config BR2_PACKAGE_KMOD_USB_SERIAL_FTDI - tristate "kmod-usb-serial-ftdi......... Support for FTDI USB-to-serial converterr" + prompt "kmod-usb-serial-ftdi............ Support for FTDI USB-to-serial converterr" + tristate default m depends BR2_PACKAGE_KMOD_USB_SERIAL config BR2_PACKAGE_KMOD_USB_SERIAL_MCT_U232 - tristate "kmod-usb-serial-mct-u232..... Support for Magic Control Technology USB-to-Serial converters" + prompt "kmod-usb-serial-mct-u232........ Support for Magic Control Technology USB-to-Serial converters" + tristate default m depends BR2_PACKAGE_KMOD_USB_SERIAL config BR2_PACKAGE_KMOD_USB_SERIAL_PL2303 - tristate "kmod-usb-serial-pl2303....... Support for Prolific PL2303 USB-to-Serial converters" + prompt "kmod-usb-serial-pl2303.......... Support for Prolific PL2303 USB-to-Serial converters" + tristate default m depends BR2_PACKAGE_KMOD_USB_SERIAL config BR2_PACKAGE_KMOD_USB_STORAGE - tristate "kmod-usb-storage............... Support for USB storage devices" + prompt "kmod-usb-storage.................. Support for USB storage devices" + tristate default m depends BR2_PACKAGE_KMOD_USB_CONTROLLER -comment "Misc. device support ----------" +comment "Misc. devices support" config BR2_PACKAGE_KMOD_AX25 - tristate "kmod-ax25...................... AX25 support" + prompt "kmod-ax25......................... AX25 support" + tristate default m help Kernel modules for AX25 protocol family - - ax25.o: AX25 layer 2 support - - mkiss.o: AX25 KISS driver + This package contains both the AX25 layer 2 support (ax25) and AX25 KISS driver (mkiss) config BR2_PACKAGE_KMOD_BLUETOOTH - tristate "kmod-bluetooth................. Bluetooth drivers and network stack" + prompt "kmod-bluetooth.................... Bluetooth drivers and network stack" + tristate default m help Bluetooth drivers and network stack - config BR2_PACKAGE_KMOD_LP - tristate "kmod-lp........................ Parallel port and lp support" + prompt "kmod-lp........................... Parallel port and lp support" + tristate default m help Kernel modules for line printer and parallel port support - config BR2_PACKAGE_KMOD_WD1100 - tristate "kmod-wd1100.................... Soekris net4801 watchdog" + prompt "kmod-wd1100....................... Soekris net4801 watchdog" + tristate default y depends BR2_LINUX_2_4_X86 help Driver for the NatSemi SC1x00 series Watchdog found on Soekris net4801 boards - -comment "Additional kernel modules -----" +comment "Additional kernel modules" source "target/linux/package/Config.in" diff --git a/target/linux/package/alsa/Config.in b/target/linux/package/alsa/Config.in index b8cabe280..62dd21b97 100644 --- a/target/linux/package/alsa/Config.in +++ b/target/linux/package/alsa/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KMOD_ALSA - tristate "kmod-alsa...................... Alsa Sound Drivers" + prompt "kmod-alsa......................... Alsa Sound Drivers" + tristate default m if CONFIG_DEVEL depends BR2_PACKAGE_KMOD_USB_CONTROLLER select BR2_PACKAGE_KMOD_SOUNDCORE diff --git a/target/linux/package/diag/Config.in b/target/linux/package/diag/Config.in index b68a0ee09..a33f81267 100644 --- a/target/linux/package/diag/Config.in +++ b/target/linux/package/diag/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KMOD_DIAG - tristate "kmod-diag...................... Driver for router LEDs and Buttons" + prompt "kmod-diag......................... Driver for router LEDs and Buttons" + tristate default y help Driver for router LEDs and Buttons diff --git a/target/linux/package/fuse/Config.in b/target/linux/package/fuse/Config.in index 4e87aaa85..8fbb34c07 100644 --- a/target/linux/package/fuse/Config.in +++ b/target/linux/package/fuse/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_KMOD_FUSE - tristate "kmod-fuse...................... FUSE kernel module" + prompt "kmod-fuse......................... FUSE kernel module" + tristate default m if CONFIG_DEVEL - select BR2_PACKAGE_FUSE help With FUSE it is possible to implement a fully functional filesystem in a userspace program. @@ -16,7 +16,4 @@ config BR2_PACKAGE_KMOD_FUSE * Runs on Linux kernels 2.4.X and 2.6.X * Has proven very stable over time - http://fuse.sourceforge.net/ - - This package contains the fuse.o kernel module. diff --git a/target/linux/package/hostap/Config.in b/target/linux/package/hostap/Config.in index 56286b400..700eb963f 100644 --- a/target/linux/package/hostap/Config.in +++ b/target/linux/package/hostap/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KMOD_HOSTAP - tristate "kmod-hostap.................... Host AP support for Prism2/2.5/3 IEEE 802.11b" + prompt "kmod-hostap....................... Host AP support for Prism2/2.5/3 IEEE 802.11b" + tristate default m if CONFIG_DEVEL help A driver for 802.11b wireless cards based on Intersil Prism2/2.5/3 @@ -11,12 +12,10 @@ config BR2_PACKAGE_KMOD_HOSTAP PLX/PCI/CS version of the driver to actually use the driver. http://hostap.epitest.fi/ - - This package contains the hostap.o and hostap_crypt_wep.o kernel modules. - config BR2_PACKAGE_KMOD_HOSTAP_PCI - tristate "kmod-hostap-pci.............. Host AP driver for Prism2.5 PCI adaptors" + prompt "kmod-hostap-pci................. Host AP driver for Prism2.5 PCI adaptors" + tristate default m if CONFIG_DEVEL depends BR2_PACKAGE_KMOD_HOSTAP help @@ -25,12 +24,10 @@ config BR2_PACKAGE_KMOD_HOSTAP_PCI driver. http://hostap.epitest.fi/ - - This package contains the hostap_pci.o kernel module. - config BR2_PACKAGE_KMOD_HOSTAP_PLX - tristate "kmod-hostap-plx.............. Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors" + prompt "kmod-hostap-plx................. Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors" + tristate default m if CONFIG_DEVEL depends BR2_PACKAGE_KMOD_HOSTAP help @@ -39,7 +36,4 @@ config BR2_PACKAGE_KMOD_HOSTAP_PLX driver. http://hostap.epitest.fi/ - - This package contains the hostap_plx.o kernel module. - diff --git a/target/linux/package/madwifi/Config.in b/target/linux/package/madwifi/Config.in index ad7ef4af2..c0e95be87 100644 --- a/target/linux/package/madwifi/Config.in +++ b/target/linux/package/madwifi/Config.in @@ -1,5 +1,8 @@ config BR2_PACKAGE_KMOD_MADWIFI - tristate "kmod-madwifi................... Atheros Wifi driver" + prompt "kmod-madwifi...................... Atheros Wifi driver" + tristate default m if CONFIG_DEVEL help Driver for Atheros 802.11a/b/g MiniPCI cards + + http://www.madwifi.org/ diff --git a/target/linux/package/mini_fo/Config.in b/target/linux/package/mini_fo/Config.in index 2f1b68134..a92ff9785 100644 --- a/target/linux/package/mini_fo/Config.in +++ b/target/linux/package/mini_fo/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_KMOD_MINI_FO - tristate "kmod-mini_fo................... mini fanout overlay file system" + prompt "kmod-mini_fo...................... mini fanout overlay file system" + tristate default m if CONFIG_DEVEL help The mini fanout overlay file system. - - This package contains the mini_fo.o kernel module. diff --git a/target/linux/package/openswan/Config.in b/target/linux/package/openswan/Config.in index 46fff1049..59a943f8e 100644 --- a/target/linux/package/openswan/Config.in +++ b/target/linux/package/openswan/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KMOD_OPENSWAN - tristate "kmod-openswan.................. Openswan kernel module" + prompt "kmod-openswan..................... Openswan kernel module" + tristate default m if CONFIG_DEVEL help Openswan is an implementation of IPsec for Linux. diff --git a/target/linux/package/shfs/Config.in b/target/linux/package/shfs/Config.in index 3718cd74d..61bd54b5e 100644 --- a/target/linux/package/shfs/Config.in +++ b/target/linux/package/shfs/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KMOD_SHFS - tristate "kmod-shfs...................... Shell FileSystem kernel module (ShFS) kernel module" + prompt "kmod-shfs......................... Shell FileSystem kernel module (ShFS) kernel module" + tristate default m if CONFIG_DEVEL help ShFS is a simple and easy to use Linux kernel module which @@ -19,5 +20,3 @@ config BR2_PACKAGE_KMOD_SHFS * persistent connection (reconnect after SSH dies) http://shfs.sourceforge.net/ - - This package contains the shfs.o kernel module. diff --git a/target/linux/package/wlcompat/Config.in b/target/linux/package/wlcompat/Config.in index a157c0797..e7d2b2c8b 100644 --- a/target/linux/package/wlcompat/Config.in +++ b/target/linux/package/wlcompat/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KMOD_WLCOMPAT - tristate "kmod-wlcompat.................. Wrapper providing Wireless Extensions for Broadcom wl module" + prompt "kmod-wlcompat..................... Wrapper providing Wireless Extensions for Broadcom wl module" + tristate default y depends BR2_PACKAGE_KMOD_BRCM_WL help @@ -7,7 +8,8 @@ config BR2_PACKAGE_KMOD_WLCOMPAT proprietary Broadcom wl module. config BR2_PACKAGE_KMOD_WLCOMPAT_DEBUG - tristate "kmod-wlcompat-debug............ Wrapper providing Wireless Extensions for Broadcom wl module (debug)" + prompt "kmod-wlcompat-debug............... Wrapper providing Wireless Extensions for Broadcom wl module (debug)" + tristate default m depends BR2_PACKAGE_KMOD_BRCM_WL help -- cgit v1.2.3