X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a4a6443af12b7758b12020f561fa7fe2e0a3e87f..7e450a1c869a5b227e3c91c4e71049059f1193e6:/package/broadcom-wl/Makefile?ds=inline

diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index 769cfe8ea..132b69ca2 100644
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -24,14 +24,14 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 include $(INCLUDE_DIR)/package.mk
 
 define Package/broadcom-wl/Default
-  SECTION:=net
-  CATEGORY:=Kernel drivers
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
   DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo
   SUBMENU:=Proprietary BCM43xx WiFi driver
   SUBMENUDEP:=@LINUX_2_4_BRCM
 endef
 
-define Package/kmod-brcm-wl/Default
+define KernelPackage/brcm-wl/Default
   $(call Package/broadcom-wl/Default)
   SECTION:=kernel
   DEPENDS:=@LINUX_2_4_BRCM
@@ -40,16 +40,18 @@ define Package/kmod-brcm-wl/Default
 	This package contains the proprietary wireless driver for the Broadcom \\\
 	BCM43xx chipset
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE)
+  FILES:=$(PKG_BUILD_DIR)/kmod/wl$(1).o
+  AUTOLOAD:=$(call AutoLoad,30,wl$(1))
 endef
 
-define Package/kmod-brcm-wl
-  $(call Package/kmod-brcm-wl/Default)
+define KernelPackage/brcm-wl
+  $(call KernelPackage/brcm-wl/Default,)
   TITLE+= (normal version)
   DESCRIPTION+= (normal version).
 endef
 
-define Package/kmod-brcm-wl-mimo
-  $(call Package/kmod-brcm-wl/Default)
+define KernelPackage/brcm-wl-mimo
+  $(call KernelPackage/brcm-wl/Default,_mimo)
   TITLE+= (MIMO version)
   DESCRIPTION+= (MIMO version).
 endef
@@ -57,7 +59,6 @@ endef
 define Package/wlc
   $(call Package/broadcom-wl/Default)
   TITLE:=wl driver setup utility
-  DEFAULT:=y
   DESCRIPTION:=\
 	This package contains an utility for initializing the proprietary Broadcom \\\
 	wl driver.
@@ -74,13 +75,26 @@ endef
 define Package/nas
   $(call Package/broadcom-wl/Default)
   DEPENDS+=+nvram
-  DEFAULT:=y
   TITLE:=Proprietary Broadcom WPA/WPA2 authenticator
   DESCRIPTION:=\
 	This package contains the proprietary WPA/WPA2 authenticator (nas) for the \\\
 	proprietary Broadcom wl driver.
 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)/
+endef
+
+define KernelPackage/brcm-wl/install
+	$(call install_template,$(1),)
+endef
+
+define KernelPackage/brcm-wl_mimo/install
+	$(call install_template,$(1),_mimo)
+endef
+
 MAKEFLAGS_KMOD:= -C "$(LINUX_DIR)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		ARCH="$(LINUX_KARCH)" \
@@ -106,21 +120,6 @@ define Build/Compile
 		all
 endef
 
-define wl_template
-	$(INSTALL_DIR) $(1)/etc/modules.d
-	echo "wl$(2)" > $(1)/etc/modules.d/20-wl$(2)
-	$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION)
-	$(INSTALL_DATA) $(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
-	$(call wl_template,$(1))
-endef
-
-define Package/kmod-brcm-wl-mimo/install
-	$(call wl_template,$(1),_mimo)
-endef
-
 define Package/wlc/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/sbin
@@ -141,8 +140,8 @@ define Package/nas/install
 	ln -sf nas $(1)/usr/sbin/nas4wds
 endef
 
-$(eval $(call BuildPackage,kmod-brcm-wl))
-$(eval $(call BuildPackage,kmod-brcm-wl-mimo))
+$(eval $(call KernelPackage,brcm-wl))
+$(eval $(call KernelPackage,brcm-wl-mimo))
 $(eval $(call BuildPackage,wlc))
 $(eval $(call BuildPackage,wl))
 $(eval $(call BuildPackage,nas))