X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbroadcom-wl%2FMakefile;h=ce447a4ac272c8fcb8e0476cc4d909a68cfc9ed8;hb=ae98e0cfbcade9b099afc6f7bcbbaa1ed9d5448c;hp=6fe22edb0f13babbe6af410e06be784aabe157a1;hpb=859e8f7f7d8bfbefd610d338d16498190cd51e15;p=openwrt-10.03%2F.git

diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index 6fe22edb0..ce447a4ac 100644
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -1,28 +1,35 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id: Makefile 2480 2005-11-14 02:07:33Z nbd $
 
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/include/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=broadcom-wl
-PKG_VERSION:=4.80.9.2
+PKG_VERSION:=4.80.17.0
 PKG_RELEASE:=1
 WLC_VERSION:=0.1
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
-PKG_MD5SUM:=7d9fab2c611369bbe075c3924ea77450
+PKG_MD5SUM:=3183ddb60e3e882b41df1776c89b614c
 PKG_CAT:=bzcat
 
-include $(TOPDIR)/include/package.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/kmod-brcm-wl
   SECTION:=drivers
   CATEGORY:=Drivers
   DEPENDS:=@LINUX_2_4_BRCM
   DEFAULT:=y
-  MENU:=1
-  TITLE:=Proprietary BCM43xx WiFi driver
+  SUBMENU:=Proprietary BCM43xx WiFi driver
+  SUBMENUDEP:=@LINUX_2_4_BRCM
+  TITLE:=Kernel driver (normal version)
   DESCRIPTION:=Proprietary Wireless driver for the Broadcom BCM43xx chipset
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE)
 endef
@@ -30,13 +37,13 @@ endef
 define Package/kmod-brcm-wl-mimo
   $(call Package/kmod-brcm-wl)
   DEFAULT:=m if ALL
-  MENU:=
-  TITLE:=Proprietary BCM43xx WiFi driver (MIMO version)
+  TITLE:=Kernel driver (MIMO version)
   DESCRIPTION:=Proprietary Wireless driver for the Broadcom BCM43xx chipset (MIMO version)
 endef
 
 define Package/wlc
   $(call Package/kmod-brcm-wl-mimo)
+  DEFAULT:=y
   DEPENDS:=kmod-brcm-wl
   TITLE:=Setup utility
   DESCRIPTION:=Utility for initializing the Broadcom wl driver
@@ -52,6 +59,8 @@ endef
 
 define Package/nas
   $(call Package/wl)
+  DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo +nvram
+  DEFAULT:=m
   TITLE:=Proprietary WPA/WPA2 authenticator
   DESCRIPTION:=Proprietary WPA/WPA2 authenticator for the Broadcom wl driver
 endef
@@ -78,7 +87,6 @@ define Build/Compile
 	# Compile wlc
 	$(MAKE) -C $(PKG_BUILD_DIR)/wlc \
 		$(TARGET_CONFIGURE_OPTS) \
-		CC="$(TARGET_CC)" \
 		CFLAGS="-I$(PKG_BUILD_DIR)/wlc/include $(TARGET_CFLAGS)" \
 		all
 endef
@@ -87,7 +95,7 @@ define wl_template
 	install -d -m0755 $(1)/etc/modules.d
 	echo "wl$(2)" > $(1)/etc/modules.d/20-wl$(2)
 	install -d -m0755 $(1)/lib/modules/$(LINUX_VERSION)
-	install -m0644 $(PKG_BUILD_DIR)/kmod/wl$(2).o $(1)/lib/modules/$(LINUX_VERSION)/
+	install -m0644 $(PKG_BUILD_DIR)/kmod/wl$(2).o $(PKG_BUILD_DIR)/kmod/wl$(2).o.patch $(1)/lib/modules/$(LINUX_VERSION)/
 endef
 
 define Package/kmod-brcm-wl/install
@@ -99,6 +107,7 @@ define Package/kmod-brcm-wl-mimo/install
 endef
 
 define Package/wlc/install
+	$(CP) ./files/* $(1)/
 	install -d -m0755 $(1)/sbin
 	install -m0755 $(PKG_BUILD_DIR)/wlc/wlc $(1)/sbin/
 endef