revert [4106] as it breaks toolchain selection

[openwrt.git] / package / broadcom-wl / Makefile

diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index 43a0780..961baac 100644 (file)
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -1,3 +1,9 @@
+# 
+# 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
@@ -21,8 +27,8 @@ define Package/kmod-brcm-wl
   CATEGORY:=Drivers
   DEPENDS:=@LINUX_2_4_BRCM
   DEFAULT:=y
-  MENU:=1
-  TITLE:=Proprietary BCM43xx WiFi driver
+  SUBMENU:=Proprietary BCM43xx WiFi driver
+  TITLE:=Kernel driver (normal version)
   DESCRIPTION:=Proprietary Wireless driver for the Broadcom BCM43xx chipset
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE)
 endef
@@ -30,8 +36,7 @@ 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
 
@@ -53,6 +58,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
@@ -100,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