X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/17c7b6c3fdc48301e50d22cc6138ede16bd1be24..a989a4bdd97f2e2a5340bfb96494d84b93027573:/package/broadcom-wl/Makefile

diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index 77d599552..0c977d180 100644
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -10,13 +10,15 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=broadcom-wl
-PKG_VERSION:=4.80.53.0
+PKG_VERSION:=4.150.10.5.1
 PKG_RELEASE:=1
 WLC_VERSION:=0.1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
-PKG_MD5SUM:=a7d8dde3ce474c361143b83e1d9890b1
+PKG_MD5SUM:=13cffebdcc08ef87673fbc02b2d56d52
+
+WL_WEXT=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -25,73 +27,100 @@ define Package/broadcom-wl/Default
   CATEGORY:=Kernel modules
   DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo
   SUBMENU:=Proprietary BCM43xx WiFi driver
-  SUBMENUDEP:=@TARGET_BRCM_2_4
+  SUBMENUDEP:=@TARGET_brcm_2_4
 endef
 
 define KernelPackage/brcm-wl/Default
   $(call Package/broadcom-wl/Default)
   SECTION:=kernel
-  DEPENDS:=@TARGET_BRCM_2_4
+  DEPENDS:=@TARGET_brcm_2_4 +wireless-tools
   TITLE:=Kernel driver for BCM43xx chipsets
-  DESCRIPTION:=\
-	This package contains the proprietary wireless driver for the Broadcom \\\
-	BCM43xx chipset
-  FILES:=$(PKG_BUILD_DIR)/kmod/wl$(1).o
+  FILES:=$(PKG_BUILD_DIR)/driver/wl$(1).o
   AUTOLOAD:=$(call AutoLoad,30,wl$(1))
 endef
 
+define KernelPackage/brcm-wl/Default/description
+ This package contains the proprietary wireless driver for the Broadcom 
+ BCM43xx chipset.
+endef
+
 define KernelPackage/brcm-wl
-  $(call KernelPackage/brcm-wl/Default,)
+$(call KernelPackage/brcm-wl/Default,)
   TITLE+= (normal version)
-  DESCRIPTION+= (normal version).
+endef
+
+define KernelPackage/brcm-wl/description
+$(call KernelPackage/brcm-wl/Default/description)
 endef
 
 define KernelPackage/brcm-wl-mimo
-  $(call KernelPackage/brcm-wl/Default,_mimo)
+$(call KernelPackage/brcm-wl/Default,_mimo)
   TITLE+= (MIMO version)
-  DESCRIPTION+= (MIMO version).
+endef
+
+define KernelPackage/brcm-wl-mimo/description
+$(call KernelPackage/brcm-wl/Default/description)
+endef
+
+define KernelPackage/wlcompat/Default
+  $(call KernelPackage/brcm-wl/Default,)
+  TITLE:=Kernel driver for BCM43xx chipsets
+  FILES:=$(PKG_BUILD_DIR)/wlcompat/wlcompat$(1).o
+endef
+
+define KernelPackage/wlcompat
+$(call KernelPackage/wlcompat/Default,)
+  AUTOLOAD:=$(call AutoLoad,50,wlcompat)
+endef
+
+define KernelPackage/wlcompat/description
+ This package contains a wrapper module, that provides Wireless Extension 
+ support for the proprietary Broadcom wl module.
+endef
+
+define KernelPackage/wlcompat-debug
+$(call KernelPackage/wlcompat/Default,-debug)
+  TITLE+= (debug)
+  AUTOLOAD:=
+endef
+
+define KernelPackage/wlcompat-debug/description
+$(call KernelPackage/wlcompat/description)
+ This is the debugging version.
 endef
 
 define Package/wlc
-  $(call Package/broadcom-wl/Default)
+$(call Package/broadcom-wl/Default)
   TITLE:=wl driver setup utility
-  DESCRIPTION:=\
-	This package contains an utility for initializing the proprietary Broadcom \\\
-	wl driver.
 endef
 
-define Package/wl
-  $(call Package/broadcom-wl/Default)
-  TITLE:=Proprietary Broadcom wl driver config utility
-  DESCRIPTION:=\
-	This package contains the proprietary utility (wl) for configuring the \\\
-	proprietary Broadcom wl driver.
+define Package/wlc/description
+ This package contains an utility for initializing the proprietary Broadcom 
+ wl driver.
 endef
 
-define Package/nas
-  $(call Package/broadcom-wl/Default)
-  DEPENDS+=+nvram
-  TITLE:=Proprietary Broadcom WPA/WPA2 authenticator
-  DESCRIPTION:=\
-	This package contains the proprietary WPA/WPA2 authenticator (nas) for the \\\
-	proprietary Broadcom wl driver.
+define Package/wl
+$(call Package/broadcom-wl/Default)
+  TITLE:=Proprietary Broadcom wl driver config utility
 endef
 
-
-define install_template
-	$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION)
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/kmod/wl$(2).o.patch $(1)/lib/modules/$(LINUX_VERSION)/
+define Package/wl/description
+ This package contains the proprietary utility (wl) for configuring the 
+ proprietary Broadcom wl driver.
 endef
 
-define KernelPackage/brcm-wl/install
-	$(call install_template,$(1),)
+define Package/nas
+$(call Package/broadcom-wl/Default)
+  DEPENDS+= +nvram
+  TITLE:=Proprietary Broadcom WPA/WPA2 authenticator
 endef
 
-define KernelPackage/brcm-wl_mimo/install
-	$(call install_template,$(1),_mimo)
+define Package/nas/description
+ This package contains the proprietary WPA/WPA2 authenticator (nas) for the 
+ proprietary Broadcom wl driver.
 endef
 
-MAKEFLAGS_KMOD:= -C "$(LINUX_DIR)" \
+MAKE_KMOD := $(MAKE) -C "$(LINUX_DIR)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		ARCH="$(LINUX_KARCH)" \
 		PATH="$(TARGET_PATH)" \
@@ -104,16 +133,30 @@ endef
 
 define Build/Compile
 	# Compile the kernel part
-	$(MAKE) $(MAKEFLAGS_KMOD) \
+	$(MAKE_KMOD) \
+		SUBDIRS="$(PKG_BUILD_DIR)/driver" \
+		modules
+	$(MAKE_KMOD) \
+		SUBDIRS="$(PKG_BUILD_DIR)/driver" \
+		MOD_NAME="_mimo" \
+		modules
+	$(MAKE_KMOD) \
+		SUBDIRS="$(PKG_BUILD_DIR)/wlcompat" \
+		$(if $(WL_WEXT),WL_WEXT=1) \
 		modules
-	$(MAKE) $(MAKEFLAGS_KMOD) MOD_NAME="_mimo" \
+	$(MAKE_KMOD) \
+		SUBDIRS="$(PKG_BUILD_DIR)/wlcompat" \
+		DEBUG=1 \
+		$(if $(WL_WEXT),WL_WEXT=1) \
 		modules
 
 	# Compile wlc
 	$(MAKE) -C $(PKG_BUILD_DIR)/wlc \
 		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="-I$(PKG_BUILD_DIR)/wlc/include $(TARGET_CFLAGS)" \
+		CFLAGS="$(TARGET_CFLAGS)" \
 		all
+	$(TARGET_CC) -o $(PKG_BUILD_DIR)/nas $(PKG_BUILD_DIR)/nas_exe.o -L$(STAGING_DIR)/usr/lib -lnvram
+	$(TARGET_CC) -o $(PKG_BUILD_DIR)/wl $(PKG_BUILD_DIR)/wl_exe.o
 endef
 
 define Package/wlc/install
@@ -128,8 +171,6 @@ define Package/wl/install
 endef
 
 define Package/nas/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libbcmcrypto.so $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/nas $(1)/usr/sbin/
 	ln -sf nas $(1)/usr/sbin/nas4not
@@ -138,6 +179,8 @@ endef
 
 $(eval $(call KernelPackage,brcm-wl))
 $(eval $(call KernelPackage,brcm-wl-mimo))
+$(eval $(call KernelPackage,wlcompat))
+$(eval $(call KernelPackage,wlcompat-debug))
 $(eval $(call BuildPackage,wlc))
 $(eval $(call BuildPackage,wl))
 $(eval $(call BuildPackage,nas))