ath9k: add some cleanup patches

[openwrt.git] / package / hostap-driver / Makefile

diff --git a/package/hostap-driver/Makefile b/package/hostap-driver/Makefile
index 0b526b6..d08fd9c 100644 (file)
--- a/package/hostap-driver/Makefile
+++ b/package/hostap-driver/Makefile
@@ -1,133 +1,117 @@
 # 
 # 

-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=hostap-driver
 PKG_VERSION:=0.4.9
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=hostap-driver
 PKG_VERSION:=0.4.9

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_MD5SUM:=c7534dc040ab90218257a78488ecd378
 
 include $(INCLUDE_DIR)/package.mk
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_MD5SUM:=c7534dc040ab90218257a78488ecd378
 
 include $(INCLUDE_DIR)/package.mk

-ifeq ($(DUMP),)
-  -include $(LINUX_DIR)/.config
-endif

 
 

-define KernelPackage/hostap/Default/2.4
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
-endef
-define KernelPackage/hostap/Default/2.6
-  VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)
-endef

 define KernelPackage/hostap/Default
 define KernelPackage/hostap/Default

+  VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)

   SUBMENU:=Wireless Drivers
   SUBMENU:=Wireless Drivers

-  DESCRIPTION:=\
-       Host AP is a driver for 802.11b wireless cards based on Intersil \\\
-       Prism2/2.5/3 chipset. It supports so called Host AP mode that allows the \\\
-       card to act as an IEEE 802.11 access point.

   URL:=http://hostap.epitest.fi/
   URL:=http://hostap.epitest.fi/

-  $(call KernelPackage/hostap/Default/$(KERNEL))
+endef
+
+define KernelPackage/hostap/Default/description
+ Host AP is a driver for 802.11b wireless cards based on Intersil 
+ Prism2/2.5/3 chipset. It supports so called Host AP mode that allows the 
+ card to act as an IEEE 802.11 access point.

 endef
 
 
 define KernelPackage/hostap
 endef
 
 
 define KernelPackage/hostap

-  $(call KernelPackage/hostap/Default)
-  DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-ieee80211 +kmod-crypto
+$(call KernelPackage/hostap/Default)

   TITLE:=Host AP support for Prism2/2.5/3
   TITLE:=Host AP support for Prism2/2.5/3

-  KCONFIG:=CONFIG_HOSTAP
-  DESCRIPTION+=\\\
-       \\\
-       This package contains the base Host AP driver code that is shared by \\\
-       different hardware models. You will also need to enable support for \\\
-       PLX/PCI/CS version of the driver to actually use the driver.
+  DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-lib80211 +wireless-tools
+  KCONFIG:=CONFIG_HOSTAP CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/hostap/hostap.ko
+  AUTOLOAD:=$(call AutoLoad,60,hostap)

 endef
 endef

-define KernelPackage/hostap/2.4
-  DEPENDS:=+kmod-crypto
-  FILES:= \
-       $(PKG_BUILD_DIR)/driver/modules/hostap.$(LINUX_KMOD_SUFFIX) \
-       $(PKG_BUILD_DIR)/driver/modules/hostap_crypt_ccmp.$(LINUX_KMOD_SUFFIX) \
-       $(PKG_BUILD_DIR)/driver/modules/hostap_crypt_tkip.$(LINUX_KMOD_SUFFIX) \
-       $(PKG_BUILD_DIR)/driver/modules/hostap_crypt_wep.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,60,hostap hostap_crypt_wep hostap_crypt_tkip hostap_crypt_ccmp)
+
+define KernelPackage/hostap/description
+$(call KernelPackage/hostap/Default/description)
+ This package contains the base Host AP driver code that is shared by 
+ different hardware models. You will also need to enable support for 
+ PLX/PCI/CS version of the driver to actually use the driver.

 endef
 endef

-define KernelPackage/hostap/2.6
-  FILES:= \
-       $(LINUX_DIR)/drivers/net/wireless/hostap/hostap.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,60,hostap)
+
+
+define KernelPackage/hostap-cs
+$(call KernelPackage/hostap/Default)
+  TITLE:=Host AP driver for PCMCIA adaptors
+  DEPENDS:=@PCMCIA_SUPPORT +kmod-hostap +kmod-pcmcia-core
+  KCONFIG:=CONFIG_HOSTAP_CS
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/hostap/hostap_cs.ko
+  AUTOLOAD:=$(call AutoLoad,60,hostap_cs)
+endef
+
+define KernelPackage/hostap-cs/description
+$(call KernelPackage/hostap/Default/description)
+ This package contains the Host AP driver for Prism2/2.5/3 PC cards.

 endef
 
 
 define KernelPackage/hostap-pci
 endef
 
 
 define KernelPackage/hostap-pci

-  $(call KernelPackage/hostap/Default)
-  DEPENDS:=kmod-hostap
+$(call KernelPackage/hostap/Default)

   TITLE:=Host AP driver for PCI adaptors
   TITLE:=Host AP driver for PCI adaptors

+  DEPENDS:=@PCI_SUPPORT +kmod-hostap

   KCONFIG:=CONFIG_HOSTAP_PCI
   KCONFIG:=CONFIG_HOSTAP_PCI

-  DESCRIPTION+=\\\
-       \\\
-       This package contains the Host AP driver for Prism2.5 PCI adaptors.
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/hostap/hostap_pci.ko

   AUTOLOAD:=$(call AutoLoad,60,hostap_pci)
 endef
   AUTOLOAD:=$(call AutoLoad,60,hostap_pci)
 endef

-define KernelPackage/hostap-pci/2.4
-  FILES:= \
-       $(PKG_BUILD_DIR)/driver/modules/hostap_pci.$(LINUX_KMOD_SUFFIX)
-endef
-define KernelPackage/hostap-pci/2.6
-  FILES:= \
-       $(LINUX_DIR)/drivers/net/wireless/hostap/hostap_pci.$(LINUX_KMOD_SUFFIX)
+
+define KernelPackage/hostap-pci/description
+$(call KernelPackage/hostap/Default/description)
+ This package contains the Host AP driver for Prism2.5 PCI adaptors.

 endef
 
 
 define KernelPackage/hostap-plx
 endef
 
 
 define KernelPackage/hostap-plx

-  $(call KernelPackage/hostap/Default)
-  DEPENDS:=kmod-hostap
-  KCONFIG:=CONFIG_HOSTAP_PLX
+$(call KernelPackage/hostap/Default)

   TITLE:=Host AP driver for PLX9052 based PCI adaptors
   TITLE:=Host AP driver for PLX9052 based PCI adaptors

-  DESCRIPTION+=\\\
-       \\\
-       This package contains the Host AP driver for Prism2/2.5/3 in PLX9052 \\\
-       based PCI adaptors.
+  DEPENDS:=@PCI_SUPPORT +kmod-hostap
+  KCONFIG:=CONFIG_HOSTAP_PLX
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/hostap/hostap_plx.ko

   AUTOLOAD:=$(call AutoLoad,60,hostap_plx)
 endef
   AUTOLOAD:=$(call AutoLoad,60,hostap_plx)
 endef

-define KernelPackage/hostap-plx/2.4
-  FILES:= \
-       $(PKG_BUILD_DIR)/driver/modules/hostap_plx.$(LINUX_KMOD_SUFFIX)
-endef
-define KernelPackage/hostap-plx/2.6
-  FILES:= \
-       $(LINUX_DIR)/drivers/net/wireless/hostap/hostap_plx.$(LINUX_KMOD_SUFFIX)
+
+define KernelPackage/hostap-plx/description
+$(call KernelPackage/hostap/Default/description)
+ This package contains the Host AP driver for Prism2/2.5/3 in PLX9052 
+ based PCI adaptors.

 endef
 
 
 endef
 
 

-ifeq ($(KERNEL),2.4)
-  define Build/Compile
-       $(MAKE) -C $(LINUX_DIR)/ \
-               ARCH="$(LINUX_KARCH)" \
-               CROSS_COMPILE="$(TARGET_CROSS)" \
-               SUBDIRS="$(PKG_BUILD_DIR)/driver/modules" \
-               modules
-  endef
-else
-  define Build/Prepare
+define Build/Prepare

        mkdir -p $(PKG_BUILD_DIR)
        mkdir -p $(PKG_BUILD_DIR)

-  endef
-  
-  define Build/Configure
-  endef
-  
-  define Build/Compile
-  endef
-endif
+endef
+
+define Build/Configure

 
 

+endef
+
+define Build/Compile
+
+endef
+
+define KernelPackage/hostap/install
+       $(INSTALL_DIR) $(1)/lib/wifi
+       $(INSTALL_DATA) ./files/lib/wifi/hostap.sh $(1)/lib/wifi
+endef

 
 $(eval $(call KernelPackage,hostap))
 
 $(eval $(call KernelPackage,hostap))

+$(eval $(call KernelPackage,hostap-cs))

 $(eval $(call KernelPackage,hostap-pci))
 $(eval $(call KernelPackage,hostap-plx))
 $(eval $(call KernelPackage,hostap-pci))
 $(eval $(call KernelPackage,hostap-plx))