Build b43, b43legacy and ath9k for kernels >= 2.6.27 from mac80211. Include b43legacy by default in the Generic bcm47xx profile (#4179)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13164 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 0 insertions, 262 deletions

diff --git a/package/b43/Makefile b/package/b43/Makefile
deleted file mode 100644
index 28a6cc5b39..0000000000
--- a/package/b43/Makefile
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-# Copyright (C) 2007 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id: Makefile 7440 2007-06-02 02:22:01Z nbd $
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=b43
-PKG_RELEASE:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-PKG_FWV4_NAME:=broadcom-wl
-PKG_FWV4_VERSION=4.150.10.5
-PKG_FWV4_OBJECT:=driver/wl_apsta_mimo.o
-
-PKG_FWV4_SOURCE:=$(PKG_FWV4_NAME)-$(PKG_FWV4_VERSION).tar.bz2
-PKG_FWV4_SOURCE_URL:=http://mirror2.openwrt.org/sources/
-PKG_FWV4_MD5SUM:=0c6ba9687114c6b598e8019e262d9a60
-
-PKG_FWCUTTER_NAME:=b43-fwcutter
-PKG_FWCUTTER_VERSION=011
-
-PKG_FWCUTTER_SOURCE:=$(PKG_FWCUTTER_NAME)-$(PKG_FWCUTTER_VERSION).tar.bz2
-PKG_FWCUTTER_SOURCE_URL:=http://bu3sch.de/b43/fwcutter/
-PKG_FWCUTTER_MD5SUM:=3db2f4de85a459451f5b391cf67a8d44
-
-PKG_SRC_NAME:=b43-src
-PKG_SRC_VERSION:=2008-08-06
-
-PKG_SRC_SOURCE:=compat-wireless-$(PKG_SRC_VERSION).tar.bz2
-PKG_SRC_SOURCE_URL:=http://www.orbit-lab.org/kernel/compat-wireless-2.6/2008/08/
-PKG_SRC_MD5SUM:=9563ceeed86bca0859ad5f010623277c
-
-define KernelPackage/b43
-  SUBMENU:=Wireless Drivers
-  TITLE:=Broadcom 43xx wireless support
-  DEPENDS:=@TARGET_brcm47xx +kmod-mac80211
-  FILES:=$(PKG_BUILD_DIR)/b43.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,b43)
-endef
-
-define KernelPackage/b43/description
-Kernel module for Broadcom 43xx wireless support (mac80211)
-endef
-
-EXTRA_KCONFIG:= \
-	CONFIG_B43=m \
-	CONFIG_B43_NPHY=y \
-	CONFIG_B43_DEBUG=y \
-	$(if $(CONFIG_RFKILL),CONFIG_B43_RFKILL=y) \
-	$(if $(CONFIG_LEDS_TRIGGERS),CONFIG_B43_LEDS=y) \
-
-
-EXTRA_CFLAGS:= \
-	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(EXTRA_KCONFIG)))) \
-	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(EXTRA_KCONFIG)))) \
-
-MAKE_OPTS:= \
-	ARCH="$(LINUX_KARCH)" \
-	CROSS_COMPILE="$(TARGET_CROSS)" \
-	SUBDIRS="$(PKG_BUILD_DIR)" \
-	EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
-	LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211 -I$(LINUX_DIR)/include -include linux/autoconf.h" \
-	$(EXTRA_KCONFIG)
-
-$(STAMP_PREPARED): $(DL_DIR)/$(PKG_FWV4_SOURCE) $(DL_DIR)/$(PKG_FWCUTTER_SOURCE)
-
-$(DL_DIR)/$(PKG_FWV4_SOURCE):
-	$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_FWV4_SOURCE)" "$(PKG_FWV4_MD5SUM)" $(PKG_FWV4_SOURCE_URL)
-
-$(DL_DIR)/$(PKG_FWCUTTER_SOURCE):
-	$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_FWCUTTER_SOURCE)" "$(PKG_FWCUTTER_MD5SUM)" $(PKG_FWCUTTER_SOURCE_URL)
-
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	tar xjf "$(DL_DIR)/$(PKG_FWV4_SOURCE)" -C "$(PKG_BUILD_DIR)"
-	tar xjf "$(DL_DIR)/$(PKG_FWCUTTER_SOURCE)" -C "$(PKG_BUILD_DIR)"
-	tar xjf "$(DL_DIR)/$(PKG_SRC_SOURCE)" -C "$(PKG_BUILD_DIR)"
-	$(CP) $(PKG_BUILD_DIR)/compat-wireless-$(PKG_SRC_VERSION)/drivers/net/wireless/b43/* $(PKG_BUILD_DIR)/
-	$(Build/Patch)
-	$(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used)
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-	$(MAKE) -C "$(LINUX_DIR)" \
-		$(MAKE_OPTS) \
-		modules
-
-	$(MAKE) -C "$(PKG_BUILD_DIR)/$(PKG_FWCUTTER_NAME)-$(PKG_FWCUTTER_VERSION)" \
-		CFLAGS="-I$(STAGING_DIR_HOST)/include -include endian.h"
-endef
-
-define KernelPackage/b43/install
-	$(INSTALL_DIR) $(1)/lib/firmware/
-
-	$(PKG_BUILD_DIR)/$(PKG_FWCUTTER_NAME)-$(PKG_FWCUTTER_VERSION)/b43-fwcutter \
-	-w $(1)/lib/firmware/ \
-	$(PKG_BUILD_DIR)/$(PKG_FWV4_NAME)-$(PKG_FWV4_VERSION)/$(PKG_FWV4_OBJECT)
-endef
-
-$(eval $(call KernelPackage,b43))
diff --git a/package/b43/patches/002-ssb-backport.patch b/package/b43/patches/002-ssb-backport.patch
deleted file mode 100644
index b1a7ad247e..0000000000
--- a/package/b43/patches/002-ssb-backport.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-Index: b43/dma.c
-===================================================================
---- b43.orig/dma.c	2008-07-27 13:56:25.000000000 +0200
-+++ b43/dma.c	2008-07-27 14:02:26.000000000 +0200
-@@ -328,11 +328,11 @@ static inline
- 	dma_addr_t dmaaddr;
- 
- 	if (tx) {
--		dmaaddr = ssb_dma_map_single(ring->dev->dev,
--					     buf, len, DMA_TO_DEVICE);
-+		dmaaddr = dma_map_single(ring->dev->dev->dma_dev,
-+					 buf, len, DMA_TO_DEVICE);
- 	} else {
--		dmaaddr = ssb_dma_map_single(ring->dev->dev,
--					     buf, len, DMA_FROM_DEVICE);
-+		dmaaddr = dma_map_single(ring->dev->dev->dma_dev,
-+					 buf, len, DMA_FROM_DEVICE);
- 	}
- 
- 	return dmaaddr;
-@@ -343,11 +343,11 @@ static inline
- 			  dma_addr_t addr, size_t len, int tx)
- {
- 	if (tx) {
--		ssb_dma_unmap_single(ring->dev->dev,
--				     addr, len, DMA_TO_DEVICE);
-+		dma_unmap_single(ring->dev->dev->dma_dev,
-+				 addr, len, DMA_TO_DEVICE);
- 	} else {
--		ssb_dma_unmap_single(ring->dev->dev,
--				     addr, len, DMA_FROM_DEVICE);
-+		dma_unmap_single(ring->dev->dev->dma_dev,
-+				 addr, len, DMA_FROM_DEVICE);
- 	}
- }
- 
-@@ -356,8 +356,8 @@ static inline
- 				 dma_addr_t addr, size_t len)
- {
- 	B43_WARN_ON(ring->tx);
--	ssb_dma_sync_single_for_cpu(ring->dev->dev,
--				    addr, len, DMA_FROM_DEVICE);
-+	dma_sync_single_for_cpu(ring->dev->dev->dma_dev,
-+				addr, len, DMA_FROM_DEVICE);
- }
- 
- static inline
-@@ -365,8 +365,8 @@ static inline
- 				    dma_addr_t addr, size_t len)
- {
- 	B43_WARN_ON(ring->tx);
--	ssb_dma_sync_single_for_device(ring->dev->dev,
--				       addr, len, DMA_FROM_DEVICE);
-+	dma_sync_single_for_device(ring->dev->dev->dma_dev,
-+				   addr, len, DMA_FROM_DEVICE);
- }
- 
- static inline
-@@ -381,6 +381,7 @@ static inline
- 
- static int alloc_ringmemory(struct b43_dmaring *ring)
- {
-+	struct device *dma_dev = ring->dev->dev->dma_dev;
- 	gfp_t flags = GFP_KERNEL;
- 
- 	/* The specs call for 4K buffers for 30- and 32-bit DMA with 4K
-@@ -391,14 +392,11 @@ static int alloc_ringmemory(struct b43_dmaring *ring)
- 	 * For unknown reasons - possibly a hardware error - the BCM4311 rev
- 	 * 02, which uses 64-bit DMA, needs the ring buffer in very low memory,
- 	 * which accounts for the GFP_DMA flag below.
--	 *
--	 * The flags here must match the flags in free_ringmemory below!
- 	 */
- 	if (ring->type == B43_DMA_64BIT)
- 		flags |= GFP_DMA;
--	ring->descbase = ssb_dma_alloc_consistent(ring->dev->dev,
--						  B43_DMA_RINGMEMSIZE,
--						  &(ring->dmabase), flags);
-+	ring->descbase = dma_alloc_coherent(dma_dev, B43_DMA_RINGMEMSIZE,
-+					    &(ring->dmabase), flags);
- 	if (!ring->descbase) {
- 		b43err(ring->dev->wl, "DMA ringmemory allocation failed\n");
- 		return -ENOMEM;
-@@ -410,13 +408,10 @@ static int alloc_ringmemory(struct b43_dmaring *ring)
- 
- static void free_ringmemory(struct b43_dmaring *ring)
- {
--	gfp_t flags = GFP_KERNEL;
--
--	if (ring->type == B43_DMA_64BIT)
--		flags |= GFP_DMA;
-+	struct device *dma_dev = ring->dev->dev->dma_dev;
- 
--	ssb_dma_free_consistent(ring->dev->dev, B43_DMA_RINGMEMSIZE,
--				ring->descbase, ring->dmabase, flags);
-+	dma_free_coherent(dma_dev, B43_DMA_RINGMEMSIZE,
-+			  ring->descbase, ring->dmabase);
- }
- 
- /* Reset the RX DMA channel */
-@@ -523,7 +518,7 @@ static bool b43_dma_mapping_error(struct b43_dmaring *ring,
- 				  dma_addr_t addr,
- 				  size_t buffersize, bool dma_to_device)
- {
--	if (unlikely(ssb_dma_mapping_error(ring->dev->dev, addr)))
-+	if (unlikely(dma_mapping_error(addr)))
- 		return 1;
- 
- 	switch (ring->type) {
-@@ -849,10 +844,10 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
- 			goto err_kfree_meta;
- 
- 		/* test for ability to dma to txhdr_cache */
--		dma_test = ssb_dma_map_single(dev->dev,
--					      ring->txhdr_cache,
--					      b43_txhdr_size(dev),
--					      DMA_TO_DEVICE);
-+		dma_test = dma_map_single(dev->dev->dma_dev,
-+					  ring->txhdr_cache,
-+					  b43_txhdr_size(dev),
-+					  DMA_TO_DEVICE);
- 
- 		if (b43_dma_mapping_error(ring, dma_test,
- 					  b43_txhdr_size(dev), 1)) {
-@@ -864,10 +859,10 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
- 			if (!ring->txhdr_cache)
- 				goto err_kfree_meta;
- 
--			dma_test = ssb_dma_map_single(dev->dev,
--						      ring->txhdr_cache,
--						      b43_txhdr_size(dev),
--						      DMA_TO_DEVICE);
-+			dma_test = dma_map_single(dev->dev->dma_dev,
-+						  ring->txhdr_cache,
-+						  b43_txhdr_size(dev),
-+						  DMA_TO_DEVICE);
- 
- 			if (b43_dma_mapping_error(ring, dma_test,
- 						  b43_txhdr_size(dev), 1)) {
-@@ -878,9 +873,9 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
- 			}
- 		}
- 
--		ssb_dma_unmap_single(dev->dev,
--				     dma_test, b43_txhdr_size(dev),
--				     DMA_TO_DEVICE);
-+		dma_unmap_single(dev->dev->dma_dev,
-+				 dma_test, b43_txhdr_size(dev),
-+				 DMA_TO_DEVICE);
- 	}
- 
- 	err = alloc_ringmemory(ring);