From 75920ff5a69375c28c5af6c5c41a6f326bdaaebc Mon Sep 17 00:00:00 2001 From: nico Date: Thu, 22 Apr 2010 16:13:06 +0000 Subject: [PATCH] [backfire] merge [20906:20912], [20914:20922] & [20972] git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21092 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/ar7-atm/Config.in | 6 +- package/ar7-atm/Makefile | 1 + .../busybox/{target-config.in => Config.in} | 6 + package/busybox/Makefile | 6 +- package/compcache/Config.in | 7 +- package/compcache/Makefile | 1 + package/ifx-tapi/Config.in | 5 + package/ifx-tapi/Makefile | 5 +- package/ifx-tapidemo/Config.in | 3 + package/ifx-tapidemo/Makefile | 5 +- package/ifx-vmmc/Config.in | 4 + package/ifx-vmmc/Makefile | 5 +- package/ifxmips-dsl-api/Config.in | 8 +- package/ifxmips-dsl-api/Makefile | 1 + .../{kexec-config.in => Config.in} | 6 +- package/kexec-tools/Makefile | 2 +- package/libpcap/Config.in | 7 +- package/libpcap/Makefile | 3 +- package/mac80211/Config.in | 11 - package/mac80211/Config.in.ath9k | 5 - package/mac80211/Config.in.b43 | 79 ------- package/mac80211/Config.in.b43legacy | 24 --- package/mac80211/Config.in.rt2x00 | 15 -- package/mac80211/Makefile | 193 ++++++++++++++++-- package/madwifi/Config.in | 10 +- package/madwifi/Makefile | 1 + package/mmc_over_gpio/Makefile | 34 +-- package/openssl/Config.in | 7 +- package/openssl/Makefile | 1 + package/uboot-ifxmips/Config.in | 6 +- package/uboot-ifxmips/Makefile | 1 + package/uboot-lantiq/Config.in | 8 +- package/uboot-lantiq/Makefile | 1 + package/udev/{udev-config.in => Config.in} | 6 +- package/udev/Makefile | 3 +- 35 files changed, 269 insertions(+), 217 deletions(-) rename package/busybox/{target-config.in => Config.in} (86%) rename package/kexec-tools/{kexec-config.in => Config.in} (84%) delete mode 100644 package/mac80211/Config.in delete mode 100644 package/mac80211/Config.in.ath9k delete mode 100644 package/mac80211/Config.in.b43 delete mode 100644 package/mac80211/Config.in.b43legacy delete mode 100644 package/mac80211/Config.in.rt2x00 rename package/udev/{udev-config.in => Config.in} (96%) diff --git a/package/ar7-atm/Config.in b/package/ar7-atm/Config.in index 395755c59..479b7ad07 100644 --- a/package/ar7-atm/Config.in +++ b/package/ar7-atm/Config.in @@ -1,6 +1,8 @@ +menu "Configuration" + depends on (PACKAGE_kmod-sangam-atm-annex-a || PACKAGE_kmod-sangam-atm-annex-b) + choice prompt "Firmware version" - depends on (PACKAGE_kmod-sangam-atm-annex-a || PACKAGE_kmod-sangam-atm-annex-b) default AR7_ATM_FW_VERSION_704 help This option allows you to switch between firmware/driver versions which @@ -16,3 +18,5 @@ config AR7_ATM_FW_VERSION_703 bool "D7.03.01.00" endchoice + +endmenu diff --git a/package/ar7-atm/Makefile b/package/ar7-atm/Makefile index e5cef0791..fc8b57712 100644 --- a/package/ar7-atm/Makefile +++ b/package/ar7-atm/Makefile @@ -42,6 +42,7 @@ define KernelPackage/sangam-atm/Default TITLE:=AR7 ADSL driver FILES:=$(PKG_BUILD_DIR)/tiatm.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,tiatm) + MENU:=1 endef define KernelPackage/sangam-atm/config diff --git a/package/busybox/target-config.in b/package/busybox/Config.in similarity index 86% rename from package/busybox/target-config.in rename to package/busybox/Config.in index b06556134..1002a5a0d 100644 --- a/package/busybox/target-config.in +++ b/package/busybox/Config.in @@ -1,3 +1,6 @@ +menu "Configuration" + depends on PACKAGE_busybox + config BUSYBOX_CONFIG_FEATURE_DEVFS bool default y if LINUX_2_4 @@ -31,3 +34,6 @@ config BUSYBOX_CONFIG_HUSH default y if NOMMU default n if !NOMMU +source "package/busybox/config/Config.in" + +endmenu diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 6eeb07962..e6934a6eb 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -41,11 +41,7 @@ define Package/busybox/description endef define Package/busybox/config - menu "Configuration" - depends on PACKAGE_busybox - source "$(SOURCE)/target-config.in" - source "$(SOURCE)/config/Config.in" - endmenu + source "$(SOURCE)/Config.in" endef define Build/Configure diff --git a/package/compcache/Config.in b/package/compcache/Config.in index 9904237ed..11a94d434 100644 --- a/package/compcache/Config.in +++ b/package/compcache/Config.in @@ -1,15 +1,14 @@ -# compcache configuration +menu "Configuration" + depends on PACKAGE_kmod-compcache config COMPCACHE_ENABLE bool "enabled on boot" default n - depends on PACKAGE_kmod-compcache help Enables compressed ram swap devices. config COMPCACHE_RAM_REPORTED string "swap space reported to kernel in kb" - depends on PACKAGE_kmod-compcache default "2048" help This is the amount of memory that will be reported @@ -21,10 +20,10 @@ config COMPCACHE_RAM_REPORTED config COMPCACHE_BACKUP_DEV string "Backup device for compcache" - depends on PACKAGE_kmod-compcache default "" help Compcache will use this as a backup device for swap. Example: /dev/sda5 +endmenu diff --git a/package/compcache/Makefile b/package/compcache/Makefile index 2fec28952..13a9056db 100644 --- a/package/compcache/Makefile +++ b/package/compcache/Makefile @@ -26,6 +26,7 @@ define KernelPackage/compcache VERSION:=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)+$(PKG_RELEASE) FILES:=$(PKG_BUILD_DIR)/ramzswap.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/sub-projects/compression/lzo-kmod/lzo1x.$(LINUX_KMOD_SUFFIX) + MENU:=1 endef diff --git a/package/ifx-tapi/Config.in b/package/ifx-tapi/Config.in index 56defb3dd..e360883fd 100644 --- a/package/ifx-tapi/Config.in +++ b/package/ifx-tapi/Config.in @@ -1,3 +1,6 @@ +menu "Configuration" + depends on PACKAGE_kmod-ifx-tapi + config VOICE_CPE_TAPI_FAX bool "fax relay and modem support" default n @@ -69,3 +72,5 @@ config VOICE_CPE_TAPI_TRACES help enable driver traces with different trace levels to be configured dynamically from the application or during insmod + +endmenu diff --git a/package/ifx-tapi/Makefile b/package/ifx-tapi/Makefile index fe91ad015..e4638186e 100644 --- a/package/ifx-tapi/Makefile +++ b/package/ifx-tapi/Makefile @@ -26,6 +26,7 @@ define KernelPackage/ifx-tapi DEPENDS:=+kmod-ifxos @BROKEN FILES:=$(PKG_BUILD_DIR)/src/drv_tapi.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,20,drv_tapi) + MENU:=1 endef define KernelPackage/ifx-tapi/description @@ -33,9 +34,7 @@ define KernelPackage/ifx-tapi/description endef define KernelPackage/ifx-tapi/config - if PACKAGE_kmod-ifx-tapi - source "$(SOURCE)/Config.in" - endif + source "$(SOURCE)/Config.in" endef CONFIGURE_ARGS += \ diff --git a/package/ifx-tapidemo/Config.in b/package/ifx-tapidemo/Config.in index 32594ba9c..42ec5fa1c 100644 --- a/package/ifx-tapidemo/Config.in +++ b/package/ifx-tapidemo/Config.in @@ -1,3 +1,5 @@ +menu "Configuration" + depends on PACKAGE_ifx-tapidemo choice prompt "board selection" default VOICE_CPE_TAPIDEMO_BOARD_EASY50712_V3 if TARGET_ifxmips_platform_danube @@ -34,3 +36,4 @@ config VOICE_CPE_TAPIDEMO_FAX_T.38_FW help enable T.38 fax relay demo. +endmenu diff --git a/package/ifx-tapidemo/Makefile b/package/ifx-tapidemo/Makefile index 217d4641a..b294d9d3a 100644 --- a/package/ifx-tapidemo/Makefile +++ b/package/ifx-tapidemo/Makefile @@ -26,6 +26,7 @@ define Package/ifx-tapidemo URL:=http://www.lantiq.com/ MAINTAINER:=Lantiq DEPENDS:=+kmod-ifx-tapi +kmod-ifx-vmmc @BROKEN + MENU:=1 endef define Package/ifx-tapidemo/description @@ -33,9 +34,7 @@ define Package/ifx-tapidemo/description endef define Package/ifx-tapidemo/config - if PACKAGE_ifx-tapidemo - source "$(SOURCE)/Config.in" - endif + source "$(SOURCE)/Config.in" endef CONFIGURE_ARGS += \ diff --git a/package/ifx-vmmc/Config.in b/package/ifx-vmmc/Config.in index bd3c032d3..2a7894e7f 100644 --- a/package/ifx-vmmc/Config.in +++ b/package/ifx-vmmc/Config.in @@ -1,3 +1,5 @@ +menu "Configuration" + depends on PACKAGE_kmod-ifx-vmmc choice prompt "device selection" default VOICE_CPE_VMMC_WITH_DEVICE_DANUBE_extract @@ -47,3 +49,5 @@ config VOICE_CPE_VMMC_MPS_HISTORY_SIZE MPS history buffer (default=128 words, maximum=512 words, 0=disable) To opimize the memory footprint in RAM, you might want to set the buffer size to 0. + +endmenu diff --git a/package/ifx-vmmc/Makefile b/package/ifx-vmmc/Makefile index 945d5ba7e..0fa3649e9 100644 --- a/package/ifx-vmmc/Makefile +++ b/package/ifx-vmmc/Makefile @@ -26,6 +26,7 @@ define KernelPackage/ifx-vmmc DEPENDS:=+kmod-ifx-tapi @BROKEN FILES:=$(PKG_BUILD_DIR)/src/drv_vmmc.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,drv_vmmc) + MENU:=1 endef define KernelPackage/ifx-vmmc/description @@ -33,9 +34,7 @@ define KernelPackage/ifx-vmmc/description endef define KernelPackage/ifx-vmmc/config - if PACKAGE_kmod-ifx-vmmc - source "$(SOURCE)/Config.in" - endif + source "$(SOURCE)/Config.in" endef CONFIGURE_ARGS += \ diff --git a/package/ifxmips-dsl-api/Config.in b/package/ifxmips-dsl-api/Config.in index 56177d168..72942e6ff 100644 --- a/package/ifxmips-dsl-api/Config.in +++ b/package/ifxmips-dsl-api/Config.in @@ -1,6 +1,8 @@ +menu "Configuration" + depends on PACKAGE_kmod-ifxmips-dsl-api + choice prompt "Firmware" - depends on PACKAGE_kmod-ifxmips-dsl-api default IFXMIPS_ANNEX_B help This option controls which firmware is loaded @@ -20,12 +22,12 @@ endchoice config IFXMIPS_DSL_FIRMWARE bool "ifxmips-dsl firmware extractor" default y - depends on PACKAGE_kmod-ifxmips-dsl-api help Say Y, if you need ifxmips-dsl to auto extract the firmware for you from the a800 firmware image config IFXMIPS_DSL_DEBUG bool "ifxmips-dsl debugging" - depends on PACKAGE_kmod-ifxmips-dsl-api help Say Y, if you need ifxmips-dsl to display debug messages. + +endmenu diff --git a/package/ifxmips-dsl-api/Makefile b/package/ifxmips-dsl-api/Makefile index b1952b5ed..1e19da23d 100644 --- a/package/ifxmips-dsl-api/Makefile +++ b/package/ifxmips-dsl-api/Makefile @@ -39,6 +39,7 @@ define KernelPackage/ifxmips-dsl-api $(PKG_BUILD_DIR)/src/drv_dsl_cpe_api.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/src/mei/ifxmips_atm.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,ifxmips_mei drv_dsl_cpe_api ifxmips_atm) + MENU:=1 endef define KernelPackage/ifxmips-dsl-api/description diff --git a/package/kexec-tools/kexec-config.in b/package/kexec-tools/Config.in similarity index 84% rename from package/kexec-tools/kexec-config.in rename to package/kexec-tools/Config.in index 25fed1b7c..60c819d79 100644 --- a/package/kexec-tools/kexec-config.in +++ b/package/kexec-tools/Config.in @@ -1,7 +1,9 @@ +menu "Configuration" + depends on PACKAGE_kexec-tools config KEXEC_TOOLS_TARGET_NAME string - prompt "Target name for kexec kernel" if PACKAGE_kexec-tools + prompt "Target name for kexec kernel" default EXTRA_TARGET_ARCH_NAME if powerpc64 default ARCH help @@ -12,8 +14,8 @@ config KEXEC_TOOLS_TARGET_NAME config KEXEC_TOOLS_kdump bool prompt "kdump support" - depends on PACKAGE_kexec-tools default n help Include the kdump utility. +endmenu diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile index d350bb2c8..978bb6fd5 100644 --- a/package/kexec-tools/Makefile +++ b/package/kexec-tools/Makefile @@ -34,7 +34,7 @@ define Package/kexec-tools/description endef define Package/kexec-tools/config - source "$(SOURCE)/kexec-config.in" + source "$(SOURCE)/Config.in" endef KEXEC_TARGET_NAME:=$(call qstrip,$(CONFIG_KEXEC_TOOLS_TARGET_NAME))-linux-$(TARGET_SUFFIX) diff --git a/package/libpcap/Config.in b/package/libpcap/Config.in index 1b9463e6a..ef32c1bc0 100644 --- a/package/libpcap/Config.in +++ b/package/libpcap/Config.in @@ -1,12 +1,15 @@ +menu "Configuration" + depends PACKAGE_libpcap + config PCAP_HAS_USB bool "Include USB support" - depends PACKAGE_libpcap depends PACKAGE_kmod-usb-core default n config PCAP_HAS_BT bool "Include bluetooth support" - depends PACKAGE_libpcap depends PACKAGE_kmod-bluetooth depends BROKEN default n + +endmenu diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index fcc9987c0..a885f90c7 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -25,6 +25,7 @@ define Package/libpcap CATEGORY:=Libraries TITLE:=Low-level packet capture library URL:=http://www.tcpdump.org/ + MENU:=1 endef define Package/libpcap/description @@ -33,7 +34,7 @@ capture. endef define Package/libpcap/config -source "$(SOURCE)/Config.in" + source "$(SOURCE)/Config.in" endef TARGET_CFLAGS += \ diff --git a/package/mac80211/Config.in b/package/mac80211/Config.in deleted file mode 100644 index 5994ba71e..000000000 --- a/package/mac80211/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -# mac80211 configuration - -config PACKAGE_MAC80211_DEBUGFS - bool "Export mac80211 internals in DebugFS" - depends on PACKAGE_kmod-mac80211 - default y - ---help--- - Select this to see extensive information about - the internal state of mac80211 in debugfs. - - Say N unless you know you need this. diff --git a/package/mac80211/Config.in.ath9k b/package/mac80211/Config.in.ath9k deleted file mode 100644 index 8f68b4e90..000000000 --- a/package/mac80211/Config.in.ath9k +++ /dev/null @@ -1,5 +0,0 @@ -# mac80211 configuration - -config PACKAGE_ATH9K_USE_MINSTREL - bool "use the new minstrel_ht rate control for ath9k" - depends PACKAGE_kmod-ath9k diff --git a/package/mac80211/Config.in.b43 b/package/mac80211/Config.in.b43 deleted file mode 100644 index e1f4d37d7..000000000 --- a/package/mac80211/Config.in.b43 +++ /dev/null @@ -1,79 +0,0 @@ -# B43 configuration - -choice - prompt "b43 firmware version" - depends on PACKAGE_kmod-b43 - default B43_EXPERIMENTAL - help - This option allows you to select the version of the b43 firmware. - -config B43_STABLE - bool "4.150.10.5 (stable)" - help - Stable firmware for BCM43xx devices. - - If unsure, select this. - -config B43_EXPERIMENTAL - bool "4.178.10.4 (experimental)" - help - Experimental firmware for BCM43xx devices. - - This firmware is not tested as much as the "stable" firmware. - - If unsure, select the "stable" firmware. - -config B43_OPENFIRMWARE - bool "Open FirmWare for WiFi networks" - help - Opensource firmware for BCM43xx devices. - - Do _not_ select this, unless you know what you are doing. - The Opensource firmware is not suitable for embedded devices, yet. - It does not support QoS, which is bad for AccessPoints. - It does not support hardware crypto acceleration, which is a showstopper - for embedded devices with low CPU resources. - - If unsure, select the "stable" firmware. - -endchoice - -config B43_FW_SQUASH - bool "Remove unnecessary firmware files" - depends on PACKAGE_kmod-b43 && !B43_OPENFIRMWARE - default y - help - This options allows you to remove unnecessary b43 firmware files - from the final rootfs image. This can reduce the rootfs size by - up to 200k. - - If unsure, say Y. - -config B43_FW_SQUASH_COREREVS - string "Core revisions to include" - depends on PACKAGE_kmod-b43 && B43_FW_SQUASH - default "5,6,7,8,9,10,13,14,15" - help - This is a comma seperated list of core revision numbers. - Example (keep files for rev5 only): - 5 - Example (keep files for rev5 and rev11): - 5,11 - -config B43_FW_SQUASH_PHYTYPES - string "PHY types to include" - depends on PACKAGE_kmod-b43 && B43_FW_SQUASH - default "G,LP" - help - This is a comma seperated list of PHY types: - A => A-PHY - AG => Dual A-PHY G-PHY - G => G-PHY - LP => LP-PHY - N => N-PHY - - Example (keep files for G-PHY only): - G - Example (keep files for G-PHY and N-PHY): - G,N - diff --git a/package/mac80211/Config.in.b43legacy b/package/mac80211/Config.in.b43legacy deleted file mode 100644 index 2e2f06e5a..000000000 --- a/package/mac80211/Config.in.b43legacy +++ /dev/null @@ -1,24 +0,0 @@ -# B43 configuration - -config B43LEGACY_FW_SQUASH - bool "Remove unnecessary firmware files" - depends on PACKAGE_kmod-b43legacy - default y - help - This options allows you to remove unnecessary b43legacy firmware files - from the final rootfs image. This can reduce the rootfs size by - up to 50k. - - If unsure, say Y. - -config B43LEGACY_FW_SQUASH_COREREVS - string "Core revisions to include" - depends on PACKAGE_kmod-b43legacy && B43LEGACY_FW_SQUASH - default "1,2,3,4" - help - This is a comma seperated list of core revision numbers. - Example (keep files for rev4 only): - 4 - Example (keep files for rev2 and rev4): - 2,4 - diff --git a/package/mac80211/Config.in.rt2x00 b/package/mac80211/Config.in.rt2x00 deleted file mode 100644 index f9855145b..000000000 --- a/package/mac80211/Config.in.rt2x00 +++ /dev/null @@ -1,15 +0,0 @@ -# rt2x00 configuration - -config PACKAGE_RT2X00_LIB_DEBUGFS - bool "Enable rt2x00 debugfs support" - depends PACKAGE_kmod-rt2x00-lib && PACKAGE_MAC80211_DEBUGFS - ---help--- - Enable creation of debugfs files for the rt2x00 drivers. - These debugfs files support both reading and writing of the - most important register types of the rt2x00 hardware. - -config PACKAGE_RT2X00_DEBUG - bool "Enable rt2x00 debug output" - depends PACKAGE_kmod-rt2x00-lib - ---help--- - Enable debugging output for all rt2x00 modules diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index d93c982f6..ba4cda5df 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -66,10 +66,23 @@ define KernelPackage/mac80211 DEPENDS+= +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +kmod-cfg80211 FILES:= $(PKG_BUILD_DIR)/net/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,21,mac80211) + MENU:=1 endef define KernelPackage/mac80211/config - source "$(SOURCE)/Config.in" + menu "Configuration" + depends on PACKAGE_kmod-mac80211 + + config PACKAGE_MAC80211_DEBUGFS + bool "Export mac80211 internals in DebugFS" + default y + help + Select this to see extensive information about + the internal state of mac80211 in debugfs. + + Say N unless you know you need this. + + endmenu endef define KernelPackage/mac80211/description @@ -186,10 +199,27 @@ $(call KernelPackage/rt2x00/Default) TITLE+= (LIB) FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00lib.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,rt2x00lib) + MENU:=1 endef define KernelPackage/rt2x00-lib/config - source "$(SOURCE)/Config.in.rt2x00" + menu "Configuration" + depends PACKAGE_kmod-rt2x00-lib + + config PACKAGE_RT2X00_LIB_DEBUGFS + bool "Enable rt2x00 debugfs support" + depends PACKAGE_MAC80211_DEBUGFS + help + Enable creation of debugfs files for the rt2x00 drivers. + These debugfs files support both reading and writing of the + most important register types of the rt2x00 hardware. + + config PACKAGE_RT2X00_DEBUG + bool "Enable rt2x00 debug output" + help + Enable debugging output for all rt2x00 modules + + endmenu endef define KernelPackage/rt2x00-pci @@ -321,24 +351,27 @@ define KernelPackage/zd1211rw endef define KernelPackage/ath/config + menu "Configuration" + depends on PACKAGE_kmod-ath -config ATH_USER_REGD - bool "Force Atheros drivers to respect the user's regdomain settings" - depends on PACKAGE_kmod-ath - help - Atheros' idea of regulatory handling is that the EEPROM of the card defines - the regulatory limits and the user is only allowed to restrict the settings - even further, even if the country allows frequencies or power levels that - are forbidden by the EEPROM settings. - Select this option if you want the driver to respect the user's decision about - regulatory settings. + config ATH_USER_REGD + bool "Force Atheros drivers to respect the user's regdomain settings" + help + Atheros' idea of regulatory handling is that the EEPROM of the card defines + the regulatory limits and the user is only allowed to restrict the settings + even further, even if the country allows frequencies or power levels that + are forbidden by the EEPROM settings. -config PACKAGE_ATH_DEBUG - bool "Atheros wireless debugging" - depends on PACKAGE_kmod-ath - help - Say Y, if you want to debug atheros wireless drivers. - Right now only ath9k makes use of this. + Select this option if you want the driver to respect the user's decision about + regulatory settings. + + config PACKAGE_ATH_DEBUG + bool "Atheros wireless debugging" + help + Say Y, if you want to debug atheros wireless drivers. + Right now only ath9k makes use of this. + + endmenu endef define KernelPackage/ath @@ -347,6 +380,7 @@ define KernelPackage/ath DEPENDS+= @PCI_SUPPORT +kmod-mac80211 FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,26,ath) + MENU:=1 endef define KernelPackage/ath/description @@ -377,6 +411,7 @@ define KernelPackage/ath9k $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_hw.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,27,ath9k_hw ath9k_common ath9k) + MENU:=1 endef define KernelPackage/ath9k/description @@ -385,7 +420,13 @@ Atheros IEEE 802.11n AR5008 and AR9001 family of chipsets. endef define KernelPackage/ath9k/config - source "$(SOURCE)/Config.in.ath9k" + menu "Configuration" + depends PACKAGE_kmod-ath9k + + config PACKAGE_ATH9K_USE_MINSTREL + bool "use the new minstrel_ht rate control for ath9k" + + endmenu endef USB8388FW_NAME:=usb8388 @@ -579,10 +620,93 @@ $(call KernelPackage/b43-common) TITLE:=Broadcom 43xx wireless support FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/b43/b43.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,b43) + MENU:=1 endef define KernelPackage/b43/config - source "$(SOURCE)/Config.in.b43" + menu "Configuration" + depends on PACKAGE_kmod-b43 + + choice + prompt "b43 firmware version" + default B43_EXPERIMENTAL + help + This option allows you to select the version of the b43 firmware. + + config B43_STABLE + bool "4.150.10.5 (stable)" + help + Stable firmware for BCM43xx devices. + + If unsure, select this. + + config B43_EXPERIMENTAL + bool "4.178.10.4 (experimental)" + help + Experimental firmware for BCM43xx devices. + + This firmware is not tested as much as the "stable" firmware. + + If unsure, select the "stable" firmware. + + config B43_OPENFIRMWARE + bool "Open FirmWare for WiFi networks" + help + Opensource firmware for BCM43xx devices. + + Do _not_ select this, unless you know what you are doing. + The Opensource firmware is not suitable for embedded devices, yet. + It does not support QoS, which is bad for AccessPoints. + It does not support hardware crypto acceleration, which is a showstopper + for embedded devices with low CPU resources. + + If unsure, select the "stable" firmware. + + endchoice + + config B43_FW_SQUASH + bool "Remove unnecessary firmware files" + depends on !B43_OPENFIRMWARE + default y + help + This options allows you to remove unnecessary b43 firmware files + from the final rootfs image. This can reduce the rootfs size by + up to 200k. + + If unsure, say Y. + + config B43_FW_SQUASH_COREREVS + string "Core revisions to include" + depends on B43_FW_SQUASH + default "5,6,7,8,9,10,13,14,15" + help + This is a comma seperated list of core revision numbers. + + Example (keep files for rev5 only): + 5 + + Example (keep files for rev5 and rev11): + 5,11 + + config B43_FW_SQUASH_PHYTYPES + string "PHY types to include" + depends on B43_FW_SQUASH + default "G,LP" + help + This is a comma seperated list of PHY types: + A => A-PHY + AG => Dual A-PHY G-PHY + G => G-PHY + LP => LP-PHY + N => N-PHY + + Example (keep files for G-PHY only): + G + + Example (keep files for G-PHY and N-PHY): + G,N + + endmenu endef define KernelPackage/b43/description @@ -594,10 +718,37 @@ $(call KernelPackage/b43-common) TITLE:=Broadcom 43xx-legacy wireless support FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/b43legacy/b43legacy.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,b43legacy) + MENU:=1 endef define KernelPackage/b43legacy/config - source "$(SOURCE)/Config.in.b43legacy" + menu "Configuration" + depends on PACKAGE_kmod-b43legacy + + config B43LEGACY_FW_SQUASH + bool "Remove unnecessary firmware files" + default y + help + This options allows you to remove unnecessary b43legacy firmware files + from the final rootfs image. This can reduce the rootfs size by + up to 50k. + + If unsure, say Y. + + config B43LEGACY_FW_SQUASH_COREREVS + string "Core revisions to include" + depends on B43LEGACY_FW_SQUASH + default "1,2,3,4" + help + This is a comma seperated list of core revision numbers. + + Example (keep files for rev4 only): + 4 + + Example (keep files for rev2 and rev4): + 2,4 + + endmenu endef define KernelPackage/b43legacy/description diff --git a/package/madwifi/Config.in b/package/madwifi/Config.in index 7f1e36d04..7b72eb854 100644 --- a/package/madwifi/Config.in +++ b/package/madwifi/Config.in @@ -1,13 +1,13 @@ -# MadWifi configuration +menu "Configuration" + depends on PACKAGE_kmod-madwifi config MADWIFI_DEBUG bool "Enable compilation of debugging features" - depends on DEVEL && PACKAGE_kmod-madwifi + depends on DEVEL default n config MADWIFI_COMPRESSION bool "Enable Atheros Super A/G Compression" - depends on PACKAGE_kmod-madwifi depends !TARGET_ar71xx default n help @@ -15,7 +15,6 @@ config MADWIFI_COMPRESSION config MADWIFI_SINGLE_MODULE bool "Combine driver and net80211 into a single module" - depends on PACKAGE_kmod-madwifi default y help This option combines all driver and stack related code (except for HAL) @@ -24,7 +23,6 @@ config MADWIFI_SINGLE_MODULE choice prompt "Rate control algorithm selection" - depends on PACKAGE_kmod-madwifi default MADWIFI_RCA_MINSTREL help This option controls how MadWifi chooses its bitrate. @@ -53,3 +51,5 @@ config MADWIFI_RCA_SAMPLERATE average transmission time. endchoice + +endmenu diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index 4c8415a6b..4f01f008f 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -165,6 +165,7 @@ define KernelPackage/madwifi DEPENDS:=+wireless-tools @LINUX_2_6 @PCI_SUPPORT @(!(TARGET_avr32||TARGET_cobalt||TARGET_ep93xx||TARGET_etrax||TARGET_octeon||TARGET_pxcab||TARGET_sibyte)||BROKEN) FILES:=$(MADWIFI_FILES) AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD)) + MENU:=1 endef define KernelPackage/madwifi/description diff --git a/package/mmc_over_gpio/Makefile b/package/mmc_over_gpio/Makefile index 4c6fdb5a9..5a3ab1d60 100644 --- a/package/mmc_over_gpio/Makefile +++ b/package/mmc_over_gpio/Makefile @@ -21,28 +21,30 @@ define KernelPackage/mmc-over-gpio TITLE:=MMC/SD card over GPIO support FILES:=$(LINUX_DIR)/drivers/mmc/host/gpiommc.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,93,gpiommc) + MENU:=1 endef define Package/kmod-mmc-over-gpio/config -config KMOD_MMC_OVER_GPIO_DI_PIN - int "GPIO DI PIN" - depends PACKAGE_kmod-mmc-over-gpio - default 1 + menu "Configuration" + depends PACKAGE_kmod-mmc-over-gpio -config KMOD_MMC_OVER_GPIO_DO_PIN - int "GPIO DO PIN" - depends PACKAGE_kmod-mmc-over-gpio - default 3 + config KMOD_MMC_OVER_GPIO_DI_PIN + int "GPIO DI (Data-In) pin" + default 1 -config KMOD_MMC_OVER_GPIO_CLK_PIN - int "GPIO CLK PIN" - depends PACKAGE_kmod-mmc-over-gpio - default 4 + config KMOD_MMC_OVER_GPIO_DO_PIN + int "GPIO DO (Data-Out) pin" + default 3 -config KMOD_MMC_OVER_GPIO_CS_PIN - int "GPIO CS PIN" - depends PACKAGE_kmod-mmc-over-gpio - default 7 + config KMOD_MMC_OVER_GPIO_CLK_PIN + int "GPIO CLK (Clock) pin" + default 4 + + config KMOD_MMC_OVER_GPIO_CS_PIN + int "GPIO CS (Chip-Select) pin" + default 7 + + endmenu endef define KernelPackage/mmc-over-gpio/description diff --git a/package/openssl/Config.in b/package/openssl/Config.in index 96cba4916..1d310bdb5 100644 --- a/package/openssl/Config.in +++ b/package/openssl/Config.in @@ -1,9 +1,8 @@ -# OpenSSL configuration - -if PACKAGE_libopenssl +menu "Configuration" + depends on PACKAGE_libopenssl config OPENSSL_ENGINE bool prompt "Crypto acceleration support" -endif +endmenu diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 9f80a98f3..bdeb897e6 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -46,6 +46,7 @@ $(call Package/openssl/Default) CATEGORY:=Libraries DEPENDS:=+zlib TITLE+= (libraries) + MENU:=1 endef define Package/libopenssl/description diff --git a/package/uboot-ifxmips/Config.in b/package/uboot-ifxmips/Config.in index 4562fc8ef..afd192087 100644 --- a/package/uboot-ifxmips/Config.in +++ b/package/uboot-ifxmips/Config.in @@ -1,5 +1,9 @@ +menu "Configuration" + depends on PACKAGE_uboot-ifxmips + config IFXMIPS_UBOOT_A800 bool "add ARV452 Switch bringup hack" - depends on PACKAGE_uboot-ifxmips help Say Y, if you have a arv452 board (wav-281, A800, ..) + +endmenu diff --git a/package/uboot-ifxmips/Makefile b/package/uboot-ifxmips/Makefile index 6b78c3d0a..736e322c3 100644 --- a/package/uboot-ifxmips/Makefile +++ b/package/uboot-ifxmips/Makefile @@ -26,6 +26,7 @@ define Package/uboot-ifxmips DEPENDS:=@TARGET_ifxmips @BROKEN TITLE:=U-Boot for Infineon MIPS boards URL:=http://www.denx.de/wiki/U-Boot + MENU:=1 endef define Build/Prepare diff --git a/package/uboot-lantiq/Config.in b/package/uboot-lantiq/Config.in index e2c156d88..578b08864 100644 --- a/package/uboot-lantiq/Config.in +++ b/package/uboot-lantiq/Config.in @@ -1,7 +1,9 @@ +menu "Configuration" + depends on PACKAGE_uboot-lantiq + config UBOOT_TARGET string "target" default "easy50712_DDR166M" - depends on PACKAGE_uboot-lantiq help The configuration reflects the settings for a dedicated board hardware. Select for Danube evaluation board easy50712_DDR166M . @@ -9,7 +11,6 @@ config UBOOT_TARGET config UBOOT_RAMBOOT bool "Enable RAM boot image" - depends on PACKAGE_uboot-lantiq help Using the UART boot mode of the ROM code this image could be loaded to the RAM. While executing the image in the RAM the functionality of the uboot image can be @@ -30,6 +31,7 @@ config UBOOT_RAMBOOT_DDR_CONFIG config UBOOT_A800 bool "add ARV452 Switch bringup hack" - depends on PACKAGE_uboot-lantiq help Say Y, if you have a arv452 board (wav-281, A800, ..) + +endmenu diff --git a/package/uboot-lantiq/Makefile b/package/uboot-lantiq/Makefile index fc7c65371..d2a9cf2ad 100644 --- a/package/uboot-lantiq/Makefile +++ b/package/uboot-lantiq/Makefile @@ -30,6 +30,7 @@ define Package/uboot-lantiq DEPENDS:=@TARGET_ifxmips TITLE:=U-Boot for Lantiq reference boards URL:=http://www.denx.de/wiki/U-Boot + MENU:=1 endef define Build/Prepare diff --git a/package/udev/udev-config.in b/package/udev/Config.in similarity index 96% rename from package/udev/udev-config.in rename to package/udev/Config.in index c10bb9cc4..9144c40ed 100644 --- a/package/udev/udev-config.in +++ b/package/udev/Config.in @@ -1,11 +1,10 @@ # udev package config -menu "udev configuration" -depends on PACKAGE_udev +menu "Configuration" + depends on PACKAGE_udev config UDEV_DISABLE_LOGGING bool "Disable udev logging to syslog" - depends on PACKAGE_udev default n help Disable logging of udev messages to the syslog. If @@ -13,7 +12,6 @@ config UDEV_DISABLE_LOGGING config UDEV_ENABLE_DEBUG bool "Enable debug build of the udev package" - depends on PACKAGE_udev default n help Compile in udev debug messages. If unsure, choose diff --git a/package/udev/Makefile b/package/udev/Makefile index f14fb3b8a..26bfe8bba 100644 --- a/package/udev/Makefile +++ b/package/udev/Makefile @@ -26,6 +26,7 @@ define Package/udev TITLE:=Dynamic device management subsystem URL:=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html MAINTAINER:=Geoff Levand + MENU:=1 endef define Package/udev/description @@ -34,7 +35,7 @@ define Package/udev/description endef define Package/udev/config - source "$(SOURCE)/udev-config.in" + source "$(SOURCE)/Config.in" endef udev-args-$(CONFIG_UDEV_DISABLE_LOGGING) += --disable-logging