[AR7]: Fix two of the three bugs in #3122

[openwrt.git] / package / acx / Makefile

diff --git a/package/acx/Makefile b/package/acx/Makefile
index 77ec91b..c61bf2d 100644 (file)
--- a/package/acx/Makefile
+++ b/package/acx/Makefile
@@ -10,12 +10,16 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=acx
 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_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

-PKG_SOURCE_URL:=@openwrt/
-PKG_MD5SUM:=ec6322b9c82781897a9433ef0cefda6f
+PKG_SOURCE_URL:=@SF/acx100
+PKG_MD5SUM:=7d5ce3215708e4e9f95cf567a9ee3a12
+
+PKG_FW_NAME:=tiacx111c16
+PKG_FW_URL:=http://teknoraver.campuslife.it/software/acx-mac80211/
+PKG_FW_MD5SUM:=7026826460376f6b174f9225bd7781b9

 
 PKG_UNPACK:= \
        bzcat $(DL_DIR)/$(PKG_SOURCE) | \
 
 PKG_UNPACK:= \
        bzcat $(DL_DIR)/$(PKG_SOURCE) | \


@@ -24,9 +28,10 @@ PKG_UNPACK:= \
 
 include $(INCLUDE_DIR)/package.mk
 
 
 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
 define KernelPackage/acx
   TITLE:=Driver for TI ACX1xx chipset

-  DEPENDS:=@LINUX_2_6 @!TARGET_avr32 +wireless-tools
+  DEPENDS:=@LINUX_2_6 +wireless-tools @!TARGET_atheros @!TARGET_avr32

   URL:=http://acx100.sourceforge.net/
   SUBMENU:=Wireless Drivers
   FILES:= $(PKG_BUILD_DIR)/acx.$(LINUX_KMOD_SUFFIX)
   URL:=http://acx100.sourceforge.net/
   SUBMENU:=Wireless Drivers
   FILES:= $(PKG_BUILD_DIR)/acx.$(LINUX_KMOD_SUFFIX)


@@ -37,6 +42,11 @@ define KernelPackage/acx/description
  This package contains a driver for TI ACX1xx 802.11a/b/g chipsets.
 endef
 
  This package contains a driver for TI ACX1xx 802.11a/b/g chipsets.
 endef
 

+$(STAMP_BUILT): $(DL_DIR)/$(PKG_FW_NAME)
+
+$(DL_DIR)/$(PKG_FW_NAME):
+       $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_FW_NAME)" "$(PKG_FW_MD5SUM)" $(PKG_FW_URL)
+

 define Build/Compile
        $(MAKE) -C $(LINUX_DIR) \
                SUBDIRS="$(PKG_BUILD_DIR)" \
 define Build/Compile
        $(MAKE) -C $(LINUX_DIR) \
                SUBDIRS="$(PKG_BUILD_DIR)" \


@@ -53,4 +63,9 @@ define Build/Compile
                modules
 endef
 
                modules
 endef
 

+define KernelPackage/acx/install
+       $(INSTALL_DIR) $(1)/lib/firmware
+       $(INSTALL_DATA) $(DL_DIR)/$(PKG_FW_NAME) $(1)/lib/firmware/
+endef
+

 $(eval $(call KernelPackage,acx))
 $(eval $(call KernelPackage,acx))