From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 21 Jun 2010 08:40:21 +0000 (+0000)
Subject: broadcom-wl, broadcom-wl-old: binary 2.6 wl restricts the whole menuconfig submenu... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=69c1095dccacd5765c5e119f54e23c86aae76b62;p=openwrt%2Fstaging%2Fluka.git

broadcom-wl, broadcom-wl-old: binary 2.6 wl restricts the whole menuconfig submenu to brcm47xx, make menu depend on brcm47xx or brcm-2.4 in old and new driver package while brcm-2.4 target is still around

SVN-Revision: 21857
---

diff --git a/package/broadcom-wl-old/Makefile b/package/broadcom-wl-old/Makefile
index dafe5018fd..a72eabc2ab 100644
--- a/package/broadcom-wl-old/Makefile
+++ b/package/broadcom-wl-old/Makefile
@@ -21,16 +21,16 @@ WL_WEXT=1
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/broadcom-wl/Default
+define Package/broadcom-wl-old/Default
   SECTION:=kernel
   CATEGORY:=Kernel modules
   DEPENDS:=@PACKAGE_kmod-brcm-wl-old||PACKAGE_kmod-brcm-wl-mimo-old
   SUBMENU:=Proprietary BCM43xx WiFi driver
-  SUBMENUDEP:=@TARGET_brcm_2_4
+  SUBMENUDEP:=@TARGET_brcm_2_4||@TARGET_brcm47xx
 endef
 
-define KernelPackage/brcm-wl/Default
-  $(call Package/broadcom-wl/Default)
+define KernelPackage/brcm-wl-old/Default
+  $(call Package/broadcom-wl-old/Default)
   SECTION:=kernel
   DEPENDS:=@TARGET_brcm_2_4 +wireless-tools
   TITLE:=Kernel driver for BCM43xx chipsets
@@ -38,31 +38,31 @@ define KernelPackage/brcm-wl/Default
   AUTOLOAD:=$(call AutoLoad,30,wl$(1))
 endef
 
-define KernelPackage/brcm-wl/Default/description
+define KernelPackage/brcm-wl-old/Default/description
  This package contains the proprietary wireless driver for the Broadcom 
  BCM43xx chipset.
 endef
 
 define KernelPackage/brcm-wl-old
-$(call KernelPackage/brcm-wl/Default,)
+$(call KernelPackage/brcm-wl-old/Default,)
   TITLE+= (normal version)
 endef
 
 define KernelPackage/brcm-wl-old/description
-$(call KernelPackage/brcm-wl/Default/description)
+$(call KernelPackage/brcm-wl-old/Default/description)
 endef
 
 define KernelPackage/brcm-wl-mimo-old
-$(call KernelPackage/brcm-wl/Default,_mimo)
+$(call KernelPackage/brcm-wl-old/Default,_mimo)
   TITLE+= (MIMO version)
 endef
 
 define KernelPackage/brcm-wl-mimo-old/description
-$(call KernelPackage/brcm-wl/Default/description)
+$(call KernelPackage/brcm-wl-old/Default/description)
 endef
 
 define KernelPackage/wlcompat/Default
-  $(call KernelPackage/brcm-wl/Default,)
+  $(call KernelPackage/brcm-wl-old/Default,)
   TITLE:=Kernel driver for BCM43xx chipsets
   FILES:=$(PKG_BUILD_DIR)/wlcompat/wlcompat$(1).o
 endef
@@ -89,7 +89,7 @@ $(call KernelPackage/wlcompat/description)
 endef
 
 define Package/wlc-old
-$(call Package/broadcom-wl/Default)
+$(call Package/broadcom-wl-old/Default)
   TITLE:=wl driver setup utility
 endef
 
@@ -99,7 +99,7 @@ define Package/wlc-old/description
 endef
 
 define Package/wl-old
-$(call Package/broadcom-wl/Default)
+$(call Package/broadcom-wl-old/Default)
   TITLE:=Proprietary Broadcom wl driver config utility
 endef
 
@@ -109,7 +109,7 @@ define Package/wl-old/description
 endef
 
 define Package/nas-old
-$(call Package/broadcom-wl/Default)
+$(call Package/broadcom-wl-old/Default)
   TITLE:=Proprietary Broadcom WPA/WPA2 authenticator
 endef
 
diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index 2d4aacf14e..395ddd72cf 100644
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -23,7 +23,7 @@ define Package/broadcom-wl/Default
   CATEGORY:=Kernel modules
   DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mini
   SUBMENU:=Proprietary BCM43xx WiFi driver
-  SUBMENUDEP:=@TARGET_brcm47xx
+  SUBMENUDEP:=@TARGET_brcm47xx||@TARGET_brcm_2_4
 endef
 
 define KernelPackage/brcm-wl/Default