aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-11-10 19:01:20 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-11-10 19:01:20 +0000
commitb10aea0075a06e44378454c3ddb8dd4031b95150 (patch)
treecd9dc73ffb8b5b2e0dc65fb922264a3ecfb32ac8 /package
parentf950840ec9336184e78d331ff54508ffadd58429 (diff)
downloadupstream-b10aea0075a06e44378454c3ddb8dd4031b95150.tar.gz
upstream-b10aea0075a06e44378454c3ddb8dd4031b95150.tar.bz2
upstream-b10aea0075a06e44378454c3ddb8dd4031b95150.zip
wireless: build hermes packages from compat-wirelessand not from the kernel.
hermes now depends on cfg80211 and that is provided by compat-wireless, so the hermes driver should also be taken from that source. SVN-Revision: 23946
Diffstat (limited to 'package')
-rw-r--r--package/kernel/modules/wireless.mk66
-rw-r--r--package/mac80211/Makefile65
2 files changed, 64 insertions, 67 deletions
diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index f0dd3b8e36..4e44e7a667 100644
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -55,72 +55,6 @@ endef
$(eval $(call KernelPackage,net-airo))
-define KernelPackage/net-hermes
- SUBMENU:=$(WIRELESS_MENU)
- TITLE:=Hermes 802.11b chipset support
- DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT
- KCONFIG:=CONFIG_HERMES \
- CONFIG_HERMES_CACHE_FW_ON_INIT=n
- FILES:= \
- $(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco.ko
- AUTOLOAD:=$(call AutoLoad,50,orinoco)
-endef
-
-define KernelPackage/net-hermes/description
- Kernel support for Hermes 802.11b chipsets
-endef
-
-$(eval $(call KernelPackage,net-hermes))
-
-
-define KernelPackage/net-hermes-pci
- SUBMENU:=$(WIRELESS_MENU)
- TITLE:=Intersil Prism 2.5 PCI support
- DEPENDS:=@PCI_SUPPORT +kmod-net-hermes
- KCONFIG:=CONFIG_PCI_HERMES
- FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_pci.ko
- AUTOLOAD:=$(call AutoLoad,55,orinoco_pci)
-endef
-
-define KernelPackage/net-hermes-pci/description
- Kernel modules for Intersil Prism 2.5 PCI support
-endef
-
-$(eval $(call KernelPackage,net-hermes-pci))
-
-
-define KernelPackage/net-hermes-plx
- SUBMENU:=$(WIRELESS_MENU)
- TITLE:=PLX9052 based PCI adaptor
- DEPENDS:=@PCI_SUPPORT +kmod-net-hermes
- KCONFIG:=CONFIG_PLX_HERMES
- FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_plx.ko
- AUTOLOAD:=$(call AutoLoad,55,orinoco_plx)
-endef
-
-define KernelPackage/net-hermes-plx/description
- Kernel modules for Hermes in PLX9052 based PCI adaptors
-endef
-
-$(eval $(call KernelPackage,net-hermes-plx))
-
-
-define KernelPackage/net-hermes-pcmcia
- SUBMENU:=$(WIRELESS_MENU)
- TITLE:=Hermes based PCMCIA adaptors
- DEPENDS:=@PCMCIA_SUPPORT +kmod-net-hermes
- KCONFIG:=CONFIG_PCMCIA_HERMES
- FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_cs.ko
- AUTOLOAD:=$(call AutoLoad,55,orinoco_cs)
-endef
-
-define KernelPackage/net-hermes-pcmcia/description
- Kernel modules for Hermes based PCMCIA adaptors
-endef
-
-$(eval $(call KernelPackage,net-hermes-pcmcia))
-
-
define KernelPackage/net-prism54
SUBMENU:=$(WIRELESS_MENU)
TITLE:=Intersil Prism54 support
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 2000e03fc1..215f3ee085 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -577,6 +577,55 @@ define KernelPackage/net-ipw2200/description
endef
+define KernelPackage/net-hermes
+ $(call KernelPackage/mac80211/Default)
+ TITLE:=Hermes 802.11b chipset support
+ DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-cfg80211
+ FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco.ko
+ AUTOLOAD:=$(call AutoLoad,50,orinoco)
+endef
+
+define KernelPackage/net-hermes/description
+ Kernel support for Hermes 802.11b chipsets
+endef
+
+define KernelPackage/net-hermes-pci
+ $(call KernelPackage/mac80211/Default)
+ TITLE:=Intersil Prism 2.5 PCI support
+ DEPENDS:=@PCI_SUPPORT +kmod-net-hermes +kmod-cfg80211
+ FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco_pci.ko
+ AUTOLOAD:=$(call AutoLoad,55,orinoco_pci)
+endef
+
+define KernelPackage/net-hermes-pci/description
+ Kernel modules for Intersil Prism 2.5 PCI support
+endef
+
+define KernelPackage/net-hermes-plx
+ $(call KernelPackage/mac80211/Default)
+ TITLE:=PLX9052 based PCI adaptor
+ DEPENDS:=@PCI_SUPPORT +kmod-net-hermes +kmod-cfg80211
+ FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco_plx.ko
+ AUTOLOAD:=$(call AutoLoad,55,orinoco_plx)
+endef
+
+define KernelPackage/net-hermes-plx/description
+ Kernel modules for Hermes in PLX9052 based PCI adaptors
+endef
+
+define KernelPackage/net-hermes-pcmcia
+ $(call KernelPackage/mac80211/Default)
+ TITLE:=Hermes based PCMCIA adaptors
+ DEPENDS:=@PCMCIA_SUPPORT +kmod-net-hermes +kmod-cfg80211
+ FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco_cs.ko
+ AUTOLOAD:=$(call AutoLoad,55,orinoco_cs)
+endef
+
+define KernelPackage/net-hermes-pcmcia/description
+ Kernel modules for Hermes based PCMCIA adaptors
+endef
+
+
define KernelPackage/mwl8k
$(call KernelPackage/mac80211/Default)
TITLE:=Driver for Marvell TOPDOG 802.11 Wireless cards
@@ -924,7 +973,17 @@ MAKE_OPTS:= \
CONFIG_AT76C50X_USB= \
CONFIG_WL12XX= \
CONFIG_EEPROM_93CX6= \
- CONFIG_HERMES= \
+ CONFIG_HERMES=$(if $(CONFIG_PACKAGE_kmod-net-hermes),m) \
+ CONFIG_HERMES_CACHE_FW_ON_INIT= \
+ CONFIG_PCI_HERMES=$(if $(CONFIG_PACKAGE_kmod-net-hermes-pci),m) \
+ CONFIG_PLX_HERMES=$(if $(CONFIG_PACKAGE_kmod-net-hermes-plx),m) \
+ CONFIG_PCMCIA_HERMES=$(if $(CONFIG_PACKAGE_kmod-net-hermes-pcmcia),m) \
+ CONFIG_HERMES_PRISM= \
+ CONFIG_APPLE_AIRPORT= \
+ CONFIG_TMD_HERMES= \
+ CONFIG_NORTEL_HERMES= \
+ CONFIG_PCMCIA_SPECTRUM= \
+ CONFIG_ORINOCO_USB= \
CONFIG_AR9170_USB=$(if $(CONFIG_PACKAGE_kmod-ar9170),m) \
CONFIG_AR9170_LEDS=$(CONFIG_LEDS_TRIGGERS) \
CONFIG_IWM= \
@@ -1129,3 +1188,7 @@ $(eval $(call KernelPackage,net-libipw))
$(eval $(call KernelPackage,net-ipw2100))
$(eval $(call KernelPackage,net-ipw2200))
$(eval $(call KernelPackage,mwl8k))
+$(eval $(call KernelPackage,net-hermes))
+$(eval $(call KernelPackage,net-hermes-pci))
+$(eval $(call KernelPackage,net-hermes-plx))
+$(eval $(call KernelPackage,net-hermes-pcmcia))