Merge branch 'openssl'

[openwrt.git] / package / acx / Makefile

diff --git a/package/acx/Makefile b/package/acx/Makefile
index 70d394d..107a54f 100644 (file)
--- a/package/acx/Makefile
+++ b/package/acx/Makefile
@@ -10,33 +10,50 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=acx
-PKG_VERSION:=20070101
+PKG_VERSION:=20080210
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@openwrt/
-PKG_MD5SUM:=ec6322b9c82781897a9433ef0cefda6f
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-#PKG_CAT:=bzcat
-PKG_UNPACK:=bzcat $(DL_DIR)/$(PKG_SOURCE) | \
+PKG_SOURCE_URL:=@SF/acx100
+PKG_MD5SUM:=7d5ce3215708e4e9f95cf567a9ee3a12
+
+PKG_FW_C16_NAME:=tiacx111c16
+PKG_FW_C16_URL:=http://teknoraver.campuslife.it/software/acx-mac80211/
+PKG_FW_C16_MD5SUM:=7026826460376f6b174f9225bd7781b9
+
+PKG_FW_C19_NAME:=tiacx111c19
+PKG_FW_C19_URL:=http://ipkg.k1k2.de/files/
+PKG_FW_C19_MD5SUM:=a1fa9681e297b4e36e257090fc12265a
+
+PKG_UNPACK:= \
+       bzcat $(DL_DIR)/$(PKG_SOURCE) | \
        $(TAR) -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS); \
        chmod -R u+w $(PKG_BUILD_DIR)
 
 include $(INCLUDE_DIR)/package.mk
 
+# XXX: remove @!TARGET_* later when we have PCI support properly detected on all targets
 define KernelPackage/acx
   TITLE:=Driver for TI ACX1xx chipset
-  DEPENDS:=@LINUX_2_6 +wireless-tools
-  DESCRIPTION:=\
-       This package contains a driver for TI ACX1xx 802.11a/b/g chipsets.
+  DEPENDS:=@LINUX_2_6 +wireless-tools @!TARGET_atheros @!TARGET_avr32 @!TARGET_uml
   URL:=http://acx100.sourceforge.net/
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   SUBMENU:=Wireless Drivers
-  FILES:= \
-               $(PKG_BUILD_DIR)/acx.$(LINUX_KMOD_SUFFIX)
+  FILES:= $(PKG_BUILD_DIR)/acx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,acx)
 endef
 
+define KernelPackage/acx/description
+ This package contains a driver for TI ACX1xx 802.11a/b/g chipsets.
+endef
+
+$(STAMP_BUILT): $(DL_DIR)/$(PKG_FW_C16_NAME) $(DL_DIR)/$(PKG_FW_C19_NAME)
+
+$(DL_DIR)/$(PKG_FW_C16_NAME):
+       $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_FW_C16_NAME)" "$(PKG_FW_C16_MD5SUM)" $(PKG_FW_C16_URL)
+
+$(DL_DIR)/$(PKG_FW_C19_NAME):
+       $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_FW_C19_NAME)" "$(PKG_FW_C19_MD5SUM)" $(PKG_FW_C19_URL)
+
 define Build/Compile
        $(MAKE) -C $(LINUX_DIR) \
                SUBDIRS="$(PKG_BUILD_DIR)" \
@@ -53,4 +70,10 @@ define Build/Compile
                modules
 endef
 
+define KernelPackage/acx/install
+       $(INSTALL_DIR) $(1)/lib/firmware
+       $(INSTALL_DATA) $(DL_DIR)/$(PKG_FW_C16_NAME) $(1)/lib/firmware/
+       $(INSTALL_DATA) $(DL_DIR)/$(PKG_FW_C19_NAME) $(1)/lib/firmware/
+endef
+
 $(eval $(call KernelPackage,acx))