X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/4dc4d541b45cd32802866e5e087c5cfe46df4a6a..fef81766d04c20696865e3f93258a01fdad9dedc:/package/broadcom-wl/Makefile diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile index b60d184fc..2d4aacf14 100644 --- a/package/broadcom-wl/Makefile +++ b/package/broadcom-wl/Makefile @@ -1,42 +1,38 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id$ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=broadcom-wl -PKG_VERSION:=4.150.10.5 +PKG_VERSION:=5.10.56.27.0 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:=0c6ba9687114c6b598e8019e262d9a60 - -WL_WEXT=1 +PKG_MD5SUM:=dfaee8bdafaa4bb5ccbcdfe541c29e7d include $(INCLUDE_DIR)/package.mk define Package/broadcom-wl/Default SECTION:=kernel CATEGORY:=Kernel modules - DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo + DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mini SUBMENU:=Proprietary BCM43xx WiFi driver - SUBMENUDEP:=@TARGET_brcm_2_4 + SUBMENUDEP:=@TARGET_brcm47xx endef define KernelPackage/brcm-wl/Default $(call Package/broadcom-wl/Default) SECTION:=kernel - DEPENDS:=@TARGET_brcm_2_4 +wireless-tools + DEPENDS:=@TARGET_brcm47xx +wireless-tools TITLE:=Kernel driver for BCM43xx chipsets - FILES:=$(PKG_BUILD_DIR)/driver/wl$(1).o - AUTOLOAD:=$(call AutoLoad,30,wl$(1)) + FILES:=$(PKG_BUILD_DIR)/driver$(1)/wl.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,30,wl) endef define KernelPackage/brcm-wl/Default/description @@ -53,42 +49,15 @@ define KernelPackage/brcm-wl/description $(call KernelPackage/brcm-wl/Default/description) endef -define KernelPackage/brcm-wl-mimo -$(call KernelPackage/brcm-wl/Default,_mimo) - TITLE+= (MIMO version) +define KernelPackage/brcm-wl-mini +$(call KernelPackage/brcm-wl/Default,-mini) + TITLE+= (Legacy version) endef -define KernelPackage/brcm-wl-mimo/description +define KernelPackage/brcm-wl-mini/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) TITLE:=wl driver setup utility @@ -99,17 +68,9 @@ define Package/wlc/description wl driver. endef -define Package/brcm-compat-ldso - TITLE:=Broadcom wl/nas binary compatibility libraries - DEPENDS:=@TARGET_brcm_2_4 - SECTION:=libs - CATEGORY:=Libraries -endef - define Package/wl $(call Package/broadcom-wl/Default) TITLE:=Proprietary Broadcom wl driver config utility -# DEPENDS+=+brcm-compat-ldso endef define Package/wl/description @@ -119,8 +80,6 @@ endef define Package/nas $(call Package/broadcom-wl/Default) - DEPENDS+= +nvram -# DEPENDS+= +brcm-compat-ldso TITLE:=Proprietary Broadcom WPA/WPA2 authenticator endef @@ -133,54 +92,52 @@ MAKE_KMOD := $(MAKE) -C "$(LINUX_DIR)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH="$(LINUX_KARCH)" \ PATH="$(TARGET_PATH)" \ - SUBDIRS="$(PKG_BUILD_DIR)/kmod" + SUBDIRS="$(PKG_BUILD_DIR)/kmod" \ define Build/Prepare $(call Build/Prepare/Default) - $(CP) src/* $(PKG_BUILD_DIR)/ + $(CP) $(PKG_BUILD_DIR)/driver $(PKG_BUILD_DIR)/driver-mini endef define Build/Compile # Compile the kernel part $(MAKE_KMOD) \ SUBDIRS="$(PKG_BUILD_DIR)/driver" \ + MODFLAGS="-DMODULE -mlong-calls" \ 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_KMOD) \ - SUBDIRS="$(PKG_BUILD_DIR)/wlcompat" \ - DEBUG=1 \ - $(if $(WL_WEXT),WL_WEXT=1) \ + SUBDIRS="$(PKG_BUILD_DIR)/driver-mini" \ + MODFLAGS="-DMODULE -mlong-calls" \ + BUILD_TYPE="wl_apsta_mini" \ modules - # Compile wlc - $(MAKE) -C $(PKG_BUILD_DIR)/wlc \ + # Compile libshared + $(MAKE) -C $(PKG_BUILD_DIR)/shared \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ + CFLAGS="$(TARGET_CFLAGS) -I. -I$(PKG_BUILD_DIR)/driver/include" \ 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)/wlc \ + -I$(PKG_BUILD_DIR)/shared -I$(PKG_BUILD_DIR)/driver/include \ + ./src/wlc.c $(PKG_BUILD_DIR)/shared/libshared.a + + $(TARGET_CC) -o $(PKG_BUILD_DIR)/nas \ + $(PKG_BUILD_DIR)/nas_exe.o \ + $(PKG_BUILD_DIR)/shared/libshared.a + $(TARGET_CC) -o $(PKG_BUILD_DIR)/wl $(PKG_BUILD_DIR)/wl_exe.o -# $(NO_TRACE_MAKE) -C compat-ldso -f build.mk PKG_INSTALL_DIR="$(PKG_BUILD_DIR)" -# $(SED) 's,ld-uClibc.so.0,ld-uClibc.brcm,' \ -# $(PKG_BUILD_DIR)/wl \ -# $(PKG_BUILD_DIR)/nas endef -define Package/brcm-compat-ldso/install - $(INSTALL_DIR) $(1)/lib - $(INSTALL_BIN) $(PKG_BUILD_DIR)/ld-uClibc.brcm $(1)/lib/ +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/shared/libshared.a $(1)/usr/lib/ endef define Package/wlc/install $(CP) ./files/* $(1)/ $(INSTALL_DIR) $(1)/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/wlc/wlc $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wlc $(1)/sbin/ endef define Package/wl/install @@ -196,10 +153,7 @@ define Package/nas/install endef $(eval $(call KernelPackage,brcm-wl)) -$(eval $(call KernelPackage,brcm-wl-mimo)) -#$(eval $(call BuildPackage,brcm-compat-ldso)) -$(eval $(call KernelPackage,wlcompat)) -$(eval $(call KernelPackage,wlcompat-debug)) +$(eval $(call KernelPackage,brcm-wl-mini)) $(eval $(call BuildPackage,wlc)) $(eval $(call BuildPackage,wl)) $(eval $(call BuildPackage,nas))