[openwrt/openwrt] mac80211: remove old legacy legacy drivers
LEDE Commits
lede-commits at lists.infradead.org
Wed Nov 9 11:45:22 PST 2022
nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/a06e023b4e124dad2b2ddf3db87cb804b7043b26
commit a06e023b4e124dad2b2ddf3db87cb804b7043b26
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Wed Oct 12 12:54:30 2022 +0200
mac80211: remove old legacy legacy drivers
Get rid of drivers that are either limited to 802.11b/g or don't even support
cfg80211/mac80211. Most of these are either limited to boards that we don't even
support anymore because of firmware size, or were only used for custom hacks by
a really small number of users in the past.
Let's get rid of those to reduce the maintenance effort and the number of useless
packages
Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
package/firmware/b43legacy-firmware/Makefile | 74 ------
package/kernel/acx-mac80211/Makefile | 255 ---------------------
.../kernel/acx-mac80211/patches/100-compat.patch | 16 --
.../acx-mac80211/patches/200-initial-macaddr.patch | 29 ---
.../kernel/acx-mac80211/patches/300-api_sync.patch | 112 ---------
package/kernel/mac80211/Makefile | 167 +-------------
package/kernel/mac80211/broadcom.mk | 22 +-
package/kernel/mac80211/intel.mk | 126 +---------
package/kernel/mac80211/marvell.mk | 42 ----
package/kernel/mac80211/ralink.mk | 43 +---
package/kernel/mac80211/realtek.mk | 27 ---
.../bcm47xx/generic/profiles/100-Broadcom-b43.mk | 6 +-
.../generic/profiles/200-Broadcom-b44-b43.mk | 4 +-
target/linux/bcm47xx/image/legacy.mk | 12 +-
.../bcm47xx/legacy/profiles/100-Broadcom-b43.mk | 4 +-
tools/Makefile | 2 +-
16 files changed, 19 insertions(+), 922 deletions(-)
diff --git a/package/firmware/b43legacy-firmware/Makefile b/package/firmware/b43legacy-firmware/Makefile
deleted file mode 100644
index 43c530cc71..0000000000
--- a/package/firmware/b43legacy-firmware/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# Copyright (C) 2016 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=b43legacy-firmware
-PKG_VERSION:=3.130.20.0
-PKG_RELEASE:=1
-
-DL_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_SOURCE:=wl_apsta-$(PKG_VERSION).o
-PKG_SOURCE_URL:=@OPENWRT
-PKG_HASH:=7dba610b1d96dd14e901bcbce14cd6ecd1b1ac6f5c0035b0d6b6dc46a7c3ef90
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/b43legacy-firmware
- SECTION:=firmware
- CATEGORY:=Firmware
- URL:=$(PKG_SOURCE_URL)
- TITLE:=Broadcom bcm43xx b43legacy firmware
-endef
-
-define Package/b43legacy-firmware/config
- if PACKAGE_b43legacy-firmware
-
- config B43LEGACY_FW_SQUASH
- bool "Remove unnecessary firmware files"
- default y
- help
- This options allows you to remove unnecessary b43legacy firmware files
- from the final rootfs image. This can reduce the rootfs size by
- up to 50k.
-
- If unsure, say Y.
-
- config B43LEGACY_FW_SQUASH_COREREVS
- string "Core revisions to include"
- depends on B43LEGACY_FW_SQUASH
- default "1,2,3,4"
- help
- This is a comma separated list of core revision numbers.
-
- Example (keep files for rev4 only):
- 4
-
- Example (keep files for rev2 and rev4):
- 2,4
-
- endif
-endef
-
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Compile
-
-endef
-
-define Package/b43legacy-firmware/install
- $(INSTALL_DIR) $(1)/lib/firmware
- b43-fwcutter --unsupported -w $(1)/lib/firmware/ $(DL_DIR)/$(PKG_SOURCE)
- ifneq ($(CONFIG_B43LEGACY_FW_SQUASH),)
- b43-fwsquash.py "G" "$(CONFIG_B43LEGACY_FW_SQUASH_COREREVS)" "$(1)/lib/firmware/b43legacy"
- endif
-endef
-
-$(eval $(call BuildPackage,b43legacy-firmware))
diff --git a/package/kernel/acx-mac80211/Makefile b/package/kernel/acx-mac80211/Makefile
deleted file mode 100644
index 240f171d1e..0000000000
--- a/package/kernel/acx-mac80211/Makefile
+++ /dev/null
@@ -1,255 +0,0 @@
-#
-# Copyright (C) 2007-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=acx-mac80211
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL:=http://git.code.sf.net/p/acx100/acx-mac80211
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2014-02-16
-PKG_SOURCE_VERSION:=b6fc31491020cb01d2cd1acc170cfa03ced7e726
-PKG_MIRROR_HASH:=58590245715f0e5fb4b57aab6d91071dfb6a97d3273f5aee0b97b1edee030ed0
-
-DL_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_DATE)
-
-PKG_CONFIG_DEPENDS:= \
- CONFIG_PACKAGE_MAC80211_DEBUGFS \
- CONFIG_PACKAGE_MAC80211_MESH \
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/acx-mac80211
- SUBMENU:=Wireless Drivers
- TITLE:=ACX1xx mac80211 driver
- DEPENDS:=@PCI_SUPPORT @mipsel +kmod-mac80211
- FILES:=$(PKG_BUILD_DIR)/acx-mac80211.ko
- AUTOLOAD:=$(call AutoProbe,acx-mac80211)
- MENU:=1
-endef
-
-define KernelPackage/acx-mac80211/config
- menu "Configuration"
- depends on PACKAGE_kmod-acx-mac80211
-
- config ACX_ID_0D
- bool "ACX1xx Radio ID 0D firmware"
- help
- Download and install firmware for:
- ACX1xx cards with Radio ID 0D into /lib/firmware.
-
- config ACX_ID_11
- bool "ACX1xx Radio ID 11 firmware"
- help
- Download and install firmware for:
- ACX1xx cards with Radio ID 11 into /lib/firmware.
-
- config ACX_ID_15
- bool "ACX1xx Radio ID 15 firmware"
- help
- Download and install firmware for:
- ACX1xx cards with Radio ID 15 into /lib/firmware.
-
- config ACX_ID_16
- bool "ACX1xx Radio ID 16 firmware"
- default y
- help
- Download and install firmware for:
- ACX1xx cards with Radio ID 16 into /lib/firmware.
-
- choice
- prompt "ACX111 firmware version"
- depends on ACX_ID_16
- default ACX_DEFAULT
- help
- This option allows you to select the version of the acx firmware.
-
- config ACX_DEFAULT
- bool "Default"
- help
- Default firmware for ACX111 devices.
-
- If unsure, select this.
-
- config ACX_1_2_1_34
- bool "1.2.1_34"
- help
- 1.2.1_34 firmware for ACX111 devices. Works with Zyxel P-334WT.
-
- If unsure, select the "default" firmware.
-
- endchoice
-
- config ACX_ID_17
- bool "ACX1xx Radio ID 17 firmware"
- help
- Download and install firmware for:
- ACX1xx cards with Radio ID 17 into /lib/firmware.
-
- config ACX_ID_19
- bool "ACX1xx Radio ID 19 firmware"
- default y
- help
- Download and install firmware for:
- ACX1xx cards with Radio ID 19 into /lib/firmware.
-
- config ACX_ID_1B
- bool "ACX1xx Radio ID 1B firmware"
- help
- Download and install firmware for:
- ACX1xx cards with Radio ID 1b into /lib/firmware.
-
- endmenu
-endef
-
-define KernelPackage/acx-mac80211/description
- Driver for acx111 cards (mac80211 version)
-endef
-
-define Download/tiacx100
- FILE:=tiacx100
- URL:=@OPENWRT
- HASH:=4f05913c940c2455b267545b12d93ad81fa5eebb0cbee22a2c7588c50525b4f0
-endef
-
-define Download/tiacx100r0d
- FILE:=tiacx100r0D
- URL:=@OPENWRT
- HASH:=6a4a7fbb24a328a88261bc2a507b2a0bf63c91e831e3f1a8caa4f6599b2215e6
-endef
-
-define Download/tiacx100r11
- FILE:=tiacx100r11
- URL:=@OPENWRT
- HASH:=e005a93a0b463e01edba2b79038b54c29a7932efee61c851a2ac644b8a4e5dd4
-endef
-
-define Download/tiacx100r15
- FILE:=tiacx100r15
- URL:=@OPENWRT
- HASH:=c6f40bead5ef45720e2d72bbe4d998367c2c7857eb7716234aedeb2ad98bcdde
-endef
-
-define Download/tiacx111c16
- FILE:=tiacx111c16
- URL:=@OPENWRT
- HASH:=cc6108d577ebc55b924ff6bab44eeee3456d284c63819277cb5460338b2f1bd7
-endef
-
-define Download/tiacx111c16_1
- FILE:=tiacx111c16_1.2.1_34
- URL:=@OPENWRT
- HASH:=672ed9d02565ab44da450c52f0ced3be99a3a3901f73454455da8e1f98ada220
-endef
-
-define Download/tiacx111c17
- FILE:=tiacx111c17
- URL:=@OPENWRT
- HASH:=2bb900a5886dbea2d3504623d9f3ac8abbb2e9fdfcf0fe233e77951dff748a40
-endef
-
-define Download/tiacx111c19
- FILE:=tiacx111c19
- URL:=@OPENWRT
- HASH:=383d86a8cfddf92400d661b4e43a9b855350fa656edd4f75b4aff7fab2d00e90
-endef
-
-define Download/tiacx111usbc1b
- FILE:=tiacx111usbc1B
- URL:=@OPENWRT
- HASH:=f3c9e574de7073014ab6eef9a0f6412c53ae521b67723360af753c41401ed4d5
-endef
-
-PKG_EXTRA_KCONFIG:= \
- CONFIG_ACX_MAC80211=m \
- CONFIG_ACX_MAC80211_PCI=m \
-
-PKG_EXTRA_CFLAGS:= \
- $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \
- $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(PKG_EXTRA_KCONFIG)))) \
- $(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS) \
- $(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS), -DCONFIG_CFG80211_DEBUGFS -DCONFIG_MAC80211_DEBUGFS) \
- $(if $(CONFIG_PACKAGE_MAC80211_MESH), -DCONFIG_MAC80211_MESH) \
- -DBACKPORTED_KERNEL_NAME=\\\"$(PKG_SOURCE)\\\" \
- -DBACKPORTED_KERNEL_VERSION=\\\"$(PKG_SOURCE_VERSION)\\\" \
- -DBACKPORTS_VERSION=\\\"unknown\\\" \
-
-define Build/Compile
- $(MAKE) -C "$(LINUX_DIR)" \
- $(KERNEL_MAKE_FLAGS) \
- M="$(PKG_BUILD_DIR)" \
- $(PKG_EXTRA_KCONFIG) \
- EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS) -DCONFIG_ACX_MAC80211_VERSION=\"KERNEL_VERSION(4,2,0)\"" \
- LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi -I$(STAGING_DIR)/usr/include/mac80211-backport \
- -I$(STAGING_DIR)/usr/include/mac80211/uapi -I$(STAGING_DIR)/usr/include/mac80211 \
- -I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/$(LINUX_UAPI_DIR) \
- -I$(LINUX_DIR)/include/generated/uapi/ -Iarch/$(LINUX_KARCH)/include \
- -Iarch/$(LINUX_KARCH)/include/$(LINUX_UAPI_DIR) \
- -Iarch/$(LINUX_KARCH)/include/generated \
- -Iarch/$(LINUX_KARCH)/include/generated/$(LINUX_UAPI_DIR) \
- -include generated/autoconf.h \
- -include backport/backport.h " \
- V="$(V)" \
- modules
-endef
-
-define Build/Configure
-endef
-
-define KernelPackage/acx-mac80211/install
- $(INSTALL_DIR) $(1)/lib/firmware
-
-ifneq ($(CONFIG_ACX_ID_0D)$(CONFIG_ACX_ID_11)$(CONFIG_ACX_ID_15),)
- $(INSTALL_DATA) $(DL_DIR)/tiacx100 $(1)/lib/firmware/
-endif
-
-ifneq ($(CONFIG_ACX_ID_0D),)
- $(INSTALL_DATA) $(DL_DIR)/tiacx100r0D $(1)/lib/firmware/
-endif
-
-ifneq ($(CONFIG_ACX_ID_11),)
- $(INSTALL_DATA) $(DL_DIR)/tiacx100r11 $(1)/lib/firmware/
-endif
-
-ifneq ($(CONFIG_ACX_ID_15),)
- $(INSTALL_DATA) $(DL_DIR)/tiacx100r15 $(1)/lib/firmware/
-endif
-
-ifneq ($(CONFIG_ACX_DEFAULT),)
- $(INSTALL_DATA) $(DL_DIR)/tiacx111c16 $(1)/lib/firmware/
-endif
-
-ifneq ($(CONFIG_ACX_1_2_1_34),)
- $(INSTALL_DATA) $(DL_DIR)/tiacx111c16_1.2.1_34 $(1)/lib/firmware/tiacx111c16
-endif
-
-ifneq ($(CONFIG_ACX_ID_17),)
- $(INSTALL_DATA) $(DL_DIR)/tiacx111c17 $(1)/lib/firmware/
-endif
-
-ifneq ($(CONFIG_ACX_ID_19),)
- $(INSTALL_DATA) $(DL_DIR)/tiacx111c19 $(1)/lib/firmware/
-endif
-
-ifneq ($(CONFIG_ACX_ID_1B),)
- $(INSTALL_DATA) $(DL_DIR)/tiacx111usbc1B $(1)/lib/firmware/
-endif
-
-endef
-
-$(eval $(call KernelPackage,acx-mac80211))
-$(eval $(call Download,tiacx100))
-$(eval $(call Download,tiacx100r0d))
-$(eval $(call Download,tiacx100r11))
-$(eval $(call Download,tiacx100r15))
-$(eval $(call Download,tiacx111c16))
-$(eval $(call Download,tiacx111c16_1))
-$(eval $(call Download,tiacx111c17))
-$(eval $(call Download,tiacx111c19))
-$(eval $(call Download,tiacx111usbc1b))
diff --git a/package/kernel/acx-mac80211/patches/100-compat.patch b/package/kernel/acx-mac80211/patches/100-compat.patch
deleted file mode 100644
index 6fcab5ea43..0000000000
--- a/package/kernel/acx-mac80211/patches/100-compat.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/pci.c b/pci.c
-index ae07f5a..72d542f 100644
---- a/pci.c
-+++ b/pci.c
-@@ -1495,7 +1495,11 @@ static struct acxpci_device_info acxpci_info_tbl[] __devinitdata = {
- #endif
-
- #ifdef CONFIG_PCI
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
- static DEFINE_PCI_DEVICE_TABLE(acxpci_id_tbl) = {
-+#else
-+static const struct pci_device_id acxpci_id_tbl[] = {
-+#endif
- { PCI_VDEVICE(TI, PCI_DEVICE_ID_TI_TNETW1100A),
- .driver_data = CHIPTYPE_ACX100,
- },
diff --git a/package/kernel/acx-mac80211/patches/200-initial-macaddr.patch b/package/kernel/acx-mac80211/patches/200-initial-macaddr.patch
deleted file mode 100644
index c0fdd433b3..0000000000
--- a/package/kernel/acx-mac80211/patches/200-initial-macaddr.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/cardsetting.c
-+++ b/cardsetting.c
-@@ -715,10 +715,25 @@ int acx1xx_get_station_id(acx_device_t *
- u8 *stationID = adev->ie_cmd_buf;
- const u8 *paddr;
- int i, res;
-+ const char *prom_addr;
-+ char *prom_getenv(const char *name);
-
- res = acx_interrogate(adev, stationID, ACX1xx_IE_DOT11_STATION_ID);
- paddr = &stationID[4];
-- for (i = 0; i < ETH_ALEN; i++) {
-+ prom_addr = NULL;
-+#ifdef CONFIG_VLYNQ
-+ prom_addr = prom_getenv("macwlan");
-+ if (prom_addr == NULL)
-+ prom_addr = prom_getenv("mac_ap");
-+#endif
-+ if (prom_addr)
-+ sscanf(prom_addr, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", adev->dev_addr,
-+ adev->dev_addr + 1,
-+ adev->dev_addr + 2,
-+ adev->dev_addr + 3,
-+ adev->dev_addr + 4,
-+ adev->dev_addr + 5);
-+ else for (i = 0; i < ETH_ALEN; i++) {
- /* we copy the MAC address (reversed in the card) to
- * the netdevice's MAC address, and on ifup it will be
- * copied into iwadev->dev_addr */
diff --git a/package/kernel/acx-mac80211/patches/300-api_sync.patch b/package/kernel/acx-mac80211/patches/300-api_sync.patch
deleted file mode 100644
index d055271f60..0000000000
--- a/package/kernel/acx-mac80211/patches/300-api_sync.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- a/main.c
-+++ b/main.c
-@@ -497,7 +497,7 @@ int acx_free_mechanics(acx_device_t *ade
-
- int acx_init_ieee80211(acx_device_t *adev, struct ieee80211_hw *hw)
- {
-- hw->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS;
-+ __clear_bit(IEEE80211_HW_RX_INCLUDES_FCS, hw->flags);
- hw->queues = 1;
- hw->wiphy->max_scan_ssids = 1;
-
-@@ -525,14 +525,14 @@ int acx_init_ieee80211(acx_device_t *ade
- /* We base signal quality on winlevel approach of previous driver
- * TODO OW 20100615 This should into a common init code
- */
-- hw->flags |= IEEE80211_HW_SIGNAL_UNSPEC;
-+ __set_bit(IEEE80211_HW_SIGNAL_UNSPEC, hw->flags);
- hw->max_signal = 100;
-
- if (IS_ACX100(adev)) {
-- adev->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
-+ adev->hw->wiphy->bands[NL80211_BAND_2GHZ] =
- &acx100_band_2GHz;
- } else if (IS_ACX111(adev))
-- adev->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
-+ adev->hw->wiphy->bands[NL80211_BAND_2GHZ] =
- &acx111_band_2GHz;
- else {
- log(L_ANY, "Error: Unknown device");
-@@ -945,8 +945,8 @@ void acx_op_configure_filter(struct ieee
- changed_flags, *total_flags);
-
- /* OWI TODO: Set also FIF_PROBE_REQ ? */
-- *total_flags &= (FIF_PROMISC_IN_BSS | FIF_ALLMULTI | FIF_FCSFAIL
-- | FIF_CONTROL | FIF_OTHER_BSS);
-+ *total_flags &= (FIF_ALLMULTI | FIF_FCSFAIL | FIF_CONTROL
-+ | FIF_OTHER_BSS);
-
- logf1(L_DEBUG, "2: *total_flags=0x%08x\n", *total_flags);
-
-@@ -1045,9 +1045,10 @@ void acx_op_tx(struct ieee80211_hw *hw,
- }
-
- int acx_op_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-- struct cfg80211_scan_request *req)
-+ struct ieee80211_scan_request *hw_req)
- {
- acx_device_t *adev = hw2adev(hw);
-+ struct cfg80211_scan_request *req = &hw_req->req;
- struct sk_buff *skb;
- size_t ssid_len = 0;
- u8 *ssid = NULL;
-@@ -1082,7 +1083,7 @@ int acx_op_hw_scan(struct ieee80211_hw *
- goto out;
- }
- #else
-- skb = ieee80211_probereq_get(adev->hw, adev->vif, ssid, ssid_len,
-+ skb = ieee80211_probereq_get(adev->hw, vif->addr, ssid, ssid_len,
- req->ie_len);
- if (!skb) {
- ret = -ENOMEM;
---- a/main.h
-+++ b/main.h
-@@ -62,7 +62,7 @@ void acx_op_tx(struct ieee80211_hw *hw,
- #endif
-
- int acx_op_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-- struct cfg80211_scan_request *req);
-+ struct ieee80211_scan_request *req);
-
- int acx_recover_hw(acx_device_t *adev);
-
---- a/cardsetting.c
-+++ b/cardsetting.c
-@@ -159,7 +159,7 @@ int acx_set_channel(acx_device_t *adev,
- int res = 0;
-
- adev->rx_status.freq = freq;
-- adev->rx_status.band = IEEE80211_BAND_2GHZ;
-+ adev->rx_status.band = NL80211_BAND_2GHZ;
-
- adev->channel = channel;
-
---- a/merge.c
-+++ b/merge.c
-@@ -2776,7 +2776,10 @@ void acx_irq_work(struct work_struct *wo
- /* HOST_INT_SCAN_COMPLETE */
- if (irqmasked & HOST_INT_SCAN_COMPLETE) {
- if (test_bit(ACX_FLAG_SCANNING, &adev->flags)) {
-- ieee80211_scan_completed(adev->hw, false);
-+ struct cfg80211_scan_info info = {
-+ .aborted = false
-+ };
-+ ieee80211_scan_completed(adev->hw, &info);
- log(L_INIT, "scan completed\n");
- clear_bit(ACX_FLAG_SCANNING, &adev->flags);
- }
-@@ -3138,10 +3141,13 @@ int acx_op_start(struct ieee80211_hw *hw
-
- void acx_stop(acx_device_t *adev)
- {
-+ struct cfg80211_scan_info info = {
-+ .aborted = true
-+ };
- acxmem_lock_flags;
-
- if (test_bit(ACX_FLAG_SCANNING, &adev->flags)) {
-- ieee80211_scan_completed(adev->hw, true);
-+ ieee80211_scan_completed(adev->hw, &info);
- acx_issue_cmd(adev, ACX1xx_CMD_STOP_SCAN, NULL, 0);
- clear_bit(ACX_FLAG_SCANNING, &adev->flags);
- }
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index 91dad18254..ec35bf67ec 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -22,15 +22,10 @@ PKG_BUILD_PARALLEL:=1
PKG_MAINTAINER:=Felix Fietkau <nbd at nbd.name>
PKG_DRIVERS = \
- adm8211 \
- hermes hermes-pci hermes-pcmcia hermes-plx\
- lib80211 \
mac80211-hwsim \
mt7601u \
- p54-common p54-pci p54-usb \
rsi91x rsi91x-usb rsi91x-sdio\
- wlcore wl12xx wl18xx \
- zd1211rw
+ wlcore wl12xx wl18xx
PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_kmod-mac80211 \
@@ -164,92 +159,6 @@ define KernelPackage/mac80211/description
Generic IEEE 802.11 Networking Stack (mac80211)
endef
-define KernelPackage/adm8211
- $(call KernelPackage/mac80211/Default)
- TITLE:=ADMTek 8211 support
- DEPENDS+=@PCI_SUPPORT +kmod-mac80211 +kmod-eeprom-93cx6
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/admtek/adm8211.ko
- AUTOLOAD:=$(call AutoProbe,adm8211)
-endef
-
-define KernelPackage/hermes
- $(call KernelPackage/mac80211/Default)
- TITLE:=Hermes 802.11b chipset support
- DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-cfg80211 + at DRIVER_WEXT_SUPPORT +kmod-crypto-michael-mic
- DEFAULT:=n
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intersil/orinoco/orinoco.ko
- AUTOLOAD:=$(call AutoProbe,orinoco)
-endef
-
-define KernelPackage/hermes/description
- Kernel support for Hermes 802.11b chipsets
-endef
-
-define KernelPackage/hermes-pci
- $(call KernelPackage/mac80211/Default)
- TITLE:=Intersil Prism 2.5 PCI support
- DEPENDS:=@PCI_SUPPORT +kmod-hermes
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intersil/orinoco/orinoco_pci.ko
- AUTOLOAD:=$(call AutoProbe,orinoco_pci)
-endef
-
-define KernelPackage/hermes-pci/description
- Kernel modules for Intersil Prism 2.5 PCI support
-endef
-
-define KernelPackage/hermes-plx
- $(call KernelPackage/mac80211/Default)
- TITLE:=PLX9052 based PCI adaptor
- DEPENDS:=@PCI_SUPPORT +kmod-hermes
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intersil/orinoco/orinoco_plx.ko
- AUTOLOAD:=$(call AutoProbe,orinoco_plx)
-endef
-
-define KernelPackage/hermes-plx/description
- Kernel modules for Hermes in PLX9052 based PCI adaptors
-endef
-
-define KernelPackage/hermes-pcmcia
- $(call KernelPackage/mac80211/Default)
- TITLE:=Hermes based PCMCIA adaptors
- DEPENDS:=@PCMCIA_SUPPORT +kmod-hermes +kmod-pcmcia-core
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intersil/orinoco/orinoco_cs.ko
- AUTOLOAD:=$(call AutoProbe,orinoco_cs)
-endef
-
-define KernelPackage/hermes-pcmcia/description
- Kernel modules for Hermes based PCMCIA adaptors
-endef
-
-
-define KernelPackage/lib80211
- $(call KernelPackage/mac80211/Default)
- TITLE:=802.11 Networking stack
- DEPENDS:=+kmod-cfg80211 +kmod-crypto-hash +kmod-crypto-ccm
- HIDDEN:=1
- FILES:= \
- $(PKG_BUILD_DIR)/net/wireless/lib80211.ko \
- $(PKG_BUILD_DIR)/net/wireless/lib80211_crypt_wep.ko \
- $(PKG_BUILD_DIR)/net/wireless/lib80211_crypt_ccmp.ko \
- $(PKG_BUILD_DIR)/net/wireless/lib80211_crypt_tkip.ko
- AUTOLOAD:=$(call AutoProbe, \
- lib80211 \
- lib80211_crypt_wep \
- lib80211_crypt_ccmp \
- lib80211_crypt_tkip \
- )
-endef
-
-define KernelPackage/lib80211/description
- Kernel modules for 802.11 Networking stack
- Includes:
- - lib80211
- - lib80211_crypt_wep
- - lib80211_crypt_tkip
- - lib80211_crytp_ccmp
-endef
-
-
define KernelPackage/mac80211-hwsim
$(call KernelPackage/mac80211/Default)
TITLE:=mac80211 HW simulation device
@@ -267,38 +176,6 @@ define KernelPackage/mt7601u
AUTOLOAD:=$(call AutoProbe,mt7601u)
endef
-define KernelPackage/p54/Default
- $(call KernelPackage/mac80211/Default)
- TITLE:=Prism54 Drivers
-endef
-
-define KernelPackage/p54/description
- Kernel module for Prism54 chipsets (mac80211)
-endef
-
-define KernelPackage/p54-common
- $(call KernelPackage/p54/Default)
- DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT) +kmod-mac80211 +kmod-lib-crc-ccitt
- TITLE+= (COMMON)
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intersil/p54/p54common.ko
-endef
-
-define KernelPackage/p54-pci
- $(call KernelPackage/p54/Default)
- TITLE+= (PCI)
- DEPENDS+= @PCI_SUPPORT +kmod-p54-common +p54-pci-firmware
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intersil/p54/p54pci.ko
- AUTOLOAD:=$(call AutoProbe,p54pci)
-endef
-
-define KernelPackage/p54-usb
- $(call KernelPackage/p54/Default)
- TITLE+= (USB)
- DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-p54-common +p54-usb-firmware
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intersil/p54/p54usb.ko
- AUTOLOAD:=$(call AutoProbe,p54usb)
-endef
-
define KernelPackage/rsi91x
$(call KernelPackage/mac80211/Default)
TITLE:=Redpine Signals Inc 91x WLAN driver support
@@ -364,23 +241,6 @@ define KernelPackage/wl18xx/description
endef
-ZD1211FW_NAME:=zd1211-firmware
-ZD1211FW_VERSION:=1.4
-define Download/zd1211rw
- FILE:=$(ZD1211FW_NAME)-$(ZD1211FW_VERSION).tar.bz2
- URL:=@SF/zd1211/
- HASH:=866308f6f59f7075f075d4959dff2ede47735c751251fecd1496df1ba4d338e1
-endef
-$(eval $(call Download,zd1211rw))
-
-define KernelPackage/zd1211rw
- $(call KernelPackage/mac80211/Default)
- TITLE:=Zydas ZD1211 support
- DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-mac80211
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/zydas/zd1211rw/zd1211rw.ko
- AUTOLOAD:=$(call AutoProbe,zd1211rw)
-endef
-
ifdef CONFIG_PACKAGE_MAC80211_DEBUGFS
config-y += \
CFG80211_DEBUGFS \
@@ -392,28 +252,14 @@ ifdef CONFIG_PACKAGE_MAC80211_TRACING
IWLWIFI_DEVICE_TRACING
endif
-config-$(call config_package,lib80211) += LIB80211 LIB80211_CRYPT_WEP LIB80211_CRYPT_CCMP LIB80211_CRYPT_TKIP
-
config-$(call config_package,mac80211-hwsim) += MAC80211_HWSIM
config-$(call config_package,mt7601u) += MT7601U
config-y += WL_MEDIATEK
-config-$(call config_package,p54-common) += P54_COMMON
-config-$(call config_package,p54-pci) += P54_PCI
-config-$(call config_package,p54-usb) += P54_USB
-
-config-$(call config_package,hermes) += HERMES
-config-$(call config_package,hermes-pci) += PCI_HERMES
-config-$(call config_package,hermes-plx) += PLX_HERMES
-config-$(call config_package,hermes-pcmcia) += PCMCIA_HERMES
-config-y += HERMES_PRISM
-
-config-$(call config_package,adm8211) += ADM8211
config-$(call config_package,wlcore) += WLCORE WLCORE_SDIO
config-$(call config_package,wl12xx) += WL12XX
config-$(call config_package,wl18xx) += WL18XX
config-y += WL_TI WILINK_PLATFORM_DATA
-config-$(call config_package,zd1211rw) += ZD1211RW
config-$(call config_package,rsi91x) += RSI_91X
config-$(call config_package,rsi91x-usb) += RSI_USB
config-$(call config_package,rsi91x-sdio) += RSI_SDIO
@@ -450,9 +296,6 @@ define Build/Prepare
mkdir -p $(PKG_BUILD_DIR)
$(PKG_UNPACK)
$(Build/Patch)
- $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IPW2100_NAME)-$(IPW2100_VERSION).tgz
- $(TAR) -C $(PKG_BUILD_DIR) -xzf $(DL_DIR)/$(IPW2200_NAME)-$(IPW2200_VERSION).tgz
- $(TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(ZD1211FW_NAME)-$(ZD1211FW_VERSION).tar.bz2
rm -rf \
$(PKG_BUILD_DIR)/include/linux/ssb \
$(PKG_BUILD_DIR)/include/linux/bcma \
@@ -463,14 +306,13 @@ define Build/Prepare
$(PKG_BUILD_DIR)/include/linux/crc8.h \
$(PKG_BUILD_DIR)/include/linux/eeprom_93cx6.h \
$(PKG_BUILD_DIR)/include/linux/wl12xx.h \
- $(PKG_BUILD_DIR)/include/linux/spi/libertas_spi.h \
$(PKG_BUILD_DIR)/include/net/ieee80211.h \
$(PKG_BUILD_DIR)/backport-include/linux/bcm47xx_nvram.h
echo 'compat-wireless-$(PKG_VERSION)-$(PKG_RELEASE)-$(REVISION)' > $(PKG_BUILD_DIR)/compat_version
endef
-ifneq ($(CONFIG_PACKAGE_kmod-cfg80211)$(CONFIG_PACKAGE_kmod-lib80211),)
+ifneq ($(CONFIG_PACKAGE_kmod-cfg80211),)
define Build/Compile/kmod
rm -rf $(PKG_BUILD_DIR)/modules
+$(MAKE) $(PKG_JOBS) $(MAKE_OPTS) modules
@@ -546,11 +388,6 @@ define KernelPackage/cfg80211/install
$(INSTALL_DATA) ./files/mac80211.hotplug $(1)/etc/hotplug.d/ieee80211/10-wifi-detect
endef
-define KernelPackage/zd1211rw/install
- $(INSTALL_DIR) $(1)/lib/firmware/zd1211
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(ZD1211FW_NAME)/zd1211* $(1)/lib/firmware/zd1211
-endef
-
$(eval $(foreach drv,$(PKG_DRIVERS),$(call KernelPackage,$(drv))))
$(eval $(call KernelPackage,cfg80211))
$(eval $(call KernelPackage,mac80211))
diff --git a/package/kernel/mac80211/broadcom.mk b/package/kernel/mac80211/broadcom.mk
index 5548f6e661..b426ec2b19 100644
--- a/package/kernel/mac80211/broadcom.mk
+++ b/package/kernel/mac80211/broadcom.mk
@@ -1,5 +1,5 @@
PKG_DRIVERS += \
- b43 b43legacy brcmsmac brcmfmac brcmutil
+ b43 brcmsmac brcmfmac brcmutil
PKG_CONFIG_DEPENDS += \
CONFIG_PACKAGE_B43_DEBUG \
@@ -24,9 +24,6 @@ config-$(CONFIG_PACKAGE_B43_PHY_HT) += B43_PHY_HT
config-$(CONFIG_PACKAGE_B43_PIO) += B43_PIO
config-$(CONFIG_PACKAGE_B43_DEBUG) += B43_DEBUG
-config-$(call config_package,b43legacy) += B43LEGACY
-config-y += B43LEGACY_DMA_MODE
-
config-$(call config_package,brcmutil) += BRCMUTIL
config-$(call config_package,brcmsmac) += BRCMSMAC
config-$(call config_package,brcmfmac) += BRCMFMAC
@@ -341,23 +338,6 @@ define KernelPackage/b43/description
Kernel module for Broadcom 43xx wireless support (mac80211 stack) new
endef
-define KernelPackage/b43legacy
- $(call KernelPackage/mac80211/Default)
- TITLE:=Broadcom 43xx-legacy wireless support
- URL:=https://wireless.wiki.kernel.org/en/users/drivers/b43
- KCONFIG:= \
- CONFIG_HW_RANDOM=y
- DEPENDS+= +kmod-mac80211 +!(TARGET_bcm47xx||TARGET_bcm63xx):kmod-ssb @!TARGET_bcm47xx_mips74k +b43legacy-firmware
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/broadcom/b43legacy/b43legacy.ko
- AUTOLOAD:=$(call AutoProbe,b43legacy)
- MENU:=1
-endef
-
-define KernelPackage/b43legacy/description
-Kernel module for Broadcom 43xx-legacy wireless support (mac80211 stack) new
-endef
-
-
define KernelPackage/brcmutil
$(call KernelPackage/mac80211/Default)
TITLE:=Broadcom IEEE802.11n common driver parts
diff --git a/package/kernel/mac80211/intel.mk b/package/kernel/mac80211/intel.mk
index eca4a574be..50eb561d18 100644
--- a/package/kernel/mac80211/intel.mk
+++ b/package/kernel/mac80211/intel.mk
@@ -1,18 +1,9 @@
-PKG_DRIVERS += \
- iwl-legacy iwl3945 iwl4965 iwlwifi \
- libipw ipw2100 ipw2200 \
+PKG_DRIVERS += iwlwifi
-config-$(call config_package,iwl-legacy) += IWLEGACY
-config-$(call config_package,iwl3945) += IWL3945
-config-$(call config_package,iwl4965) += IWL4965
config-$(call config_package,iwlwifi) += IWLWIFI IWLDVM IWLMVM
config-$(CONFIG_PACKAGE_IWLWIFI_DEBUG)+= IWLWIFI_DEBUG
config-$(CONFIG_PACKAGE_IWLWIFI_DEBUGFS)+= IWLWIFI_DEBUGFS
-config-$(call config_package,libipw) += LIBIPW
-config-$(call config_package,ipw2100) += IPW2100
-config-$(call config_package,ipw2200) += IPW2200
-
define KernelPackage/iwlwifi
$(call KernelPackage/mac80211/Default)
DEPENDS:= +kmod-mac80211 @PCI_SUPPORT + at DRIVER_11N_SUPPORT + at DRIVER_11AC_SUPPORT + at DRIVER_11AX_SUPPORT
@@ -84,118 +75,3 @@ define KernelPackage/iwlwifi/config
endif
endef
-define KernelPackage/iwl-legacy
- $(call KernelPackage/mac80211/Default)
- DEPENDS:= +kmod-mac80211 @PCI_SUPPORT
- TITLE:=Intel legacy Wireless support
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intel/iwlegacy/iwlegacy.ko
- AUTOLOAD:=$(call AutoProbe,iwlegacy)
-endef
-
-define KernelPackage/iwl-legacy/description
- iwl-legacy kernel module for legacy Intel wireless support
-endef
-
-define KernelPackage/iwl3945
- $(call KernelPackage/mac80211/Default)
- DEPENDS:= +kmod-mac80211 +kmod-iwl-legacy +iwl3945-firmware
- TITLE:=Intel iwl3945 Wireless support
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intel/iwlegacy/iwl3945.ko
- AUTOLOAD:=$(call AutoProbe,iwl3945)
-endef
-
-define KernelPackage/iwl3945/description
- iwl3945 kernel module for Intel 3945 support
-endef
-
-define KernelPackage/iwl4965
- $(call KernelPackage/mac80211/Default)
- DEPENDS:= +kmod-mac80211 +kmod-iwl-legacy + at DRIVER_11N_SUPPORT +iwl4965-firmware
- TITLE:=Intel iwl4965 Wireless support
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intel/iwlegacy/iwl4965.ko
- AUTOLOAD:=$(call AutoProbe,iwl4965)
-endef
-
-define KernelPackage/iwl4965/description
- iwl4965 kernel module for Intel 4965 support
-endef
-
-
-define KernelPackage/libipw
- $(call KernelPackage/mac80211/Default)
- TITLE:=libipw for ipw2100 and ipw2200
- DEPENDS:=@PCI_SUPPORT +kmod-crypto-michael-mic +kmod-crypto-ecb +kmod-lib80211 +kmod-cfg80211 + at DRIVER_WEXT_SUPPORT @!BIG_ENDIAN
- DEFAULT:=n
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intel/ipw2x00/libipw.ko
- AUTOLOAD:=$(call AutoProbe,libipw)
-endef
-
-define KernelPackage/libipw/description
- Hardware independent IEEE 802.11 networking stack for ipw2100 and ipw2200.
-endef
-
-IPW2100_NAME:=ipw2100-fw
-IPW2100_VERSION:=1.3
-
-define Download/ipw2100
- URL:= \
- https://src.fedoraproject.org/repo/pkgs/ipw2100-firmware/ipw2100-fw-1.3.tgz/46aa75bcda1a00efa841f9707bbbd113/ \
- https://archlinux.mirror.pkern.at/other/packages/ipw2100-fw/ \
- http://mirror.ox.ac.uk/sites/ftp.openbsd.org/pub/OpenBSD/distfiles/firmware/ \
- http://firmware.openbsd.org/firmware-dist/
- FILE:=$(IPW2100_NAME)-$(IPW2100_VERSION).tgz
- HASH:=e1107c455e48d324a616b47a622593bc8413dcce72026f72731c0b03dae3a7a2
-endef
-$(eval $(call Download,ipw2100))
-
-define KernelPackage/ipw2100
- $(call KernelPackage/mac80211/Default)
- TITLE:=Intel IPW2100 driver
- DEPENDS:=@PCI_SUPPORT +kmod-libipw
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intel/ipw2x00/ipw2100.ko
- AUTOLOAD:=$(call AutoProbe,ipw2100)
-endef
-
-define KernelPackage/ipw2100/description
- Kernel support for Intel IPW2100
- Includes:
- - ipw2100
-endef
-
-IPW2200_NAME:=ipw2200-fw
-IPW2200_VERSION:=3.1
-
-define Download/ipw2200
- URL:= \
- https://src.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-3.1.tgz/eaba788643c7cc7483dd67ace70f6e99/ \
- https://archlinux.mirror.pkern.at/other/packages/ipw2200-fw/ \
- http://mirror.ox.ac.uk/sites/ftp.openbsd.org/pub/OpenBSD/distfiles/firmware/ \
- http://firmware.openbsd.org/firmware-dist/
- FILE:=$(IPW2200_NAME)-$(IPW2200_VERSION).tgz
- HASH:=c6818c11c18cc030d55ff83f64b2bad8feef485e7742f84f94a61d811a6258bd
-endef
-$(eval $(call Download,ipw2200))
-
-define KernelPackage/ipw2200
- $(call KernelPackage/mac80211/Default)
- TITLE:=Intel IPW2200 driver
- DEPENDS:=@PCI_SUPPORT +kmod-libipw
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intel/ipw2x00/ipw2200.ko
- AUTOLOAD:=$(call AutoProbe,ipw2200)
-endef
-
-define KernelPackage/ipw2200/description
- Kernel support for Intel IPW2200
- Includes:
- - ipw2200
-endef
-
-define KernelPackage/ipw2100/install
- $(INSTALL_DIR) $(1)/lib/firmware
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/ipw2100-$(IPW2100_VERSION)*.fw $(1)/lib/firmware
-endef
-
-define KernelPackage/ipw2200/install
- $(INSTALL_DIR) $(1)/lib/firmware
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IPW2200_NAME)-$(IPW2200_VERSION)/ipw2200*.fw $(1)/lib/firmware
-endef
diff --git a/package/kernel/mac80211/marvell.mk b/package/kernel/mac80211/marvell.mk
index 254395932d..764d7f1f84 100644
--- a/package/kernel/mac80211/marvell.mk
+++ b/package/kernel/mac80211/marvell.mk
@@ -1,52 +1,10 @@
PKG_DRIVERS += \
- libertas-sdio libertas-usb libertas-spi \
mwl8k mwifiex-pcie mwifiex-sdio
-config-$(call config_package,libertas-sdio) += LIBERTAS LIBERTAS_SDIO
-config-$(call config_package,libertas-usb) += LIBERTAS LIBERTAS_USB
-config-$(call config_package,libertas-spi) += LIBERTAS LIBERTAS_SPI
config-$(call config_package,mwl8k) += MWL8K
config-$(call config_package,mwifiex-pcie) += MWIFIEX MWIFIEX_PCIE
config-$(call config_package,mwifiex-sdio) += MWIFIEX MWIFIEX_SDIO
-define KernelPackage/libertas-usb
- $(call KernelPackage/mac80211/Default)
- DEPENDS+= @USB_SUPPORT +kmod-cfg80211 +kmod-usb-core +kmod-lib80211 + at DRIVER_WEXT_SUPPORT +libertas-usb-firmware
- TITLE:=Marvell 88W8015 Wireless Driver
- DEFAULT:=n
- FILES:= \
- $(PKG_BUILD_DIR)/drivers/net/wireless/marvell/libertas/libertas.ko \
- $(PKG_BUILD_DIR)/drivers/net/wireless/marvell/libertas/usb8xxx.ko
- AUTOLOAD:=$(call AutoProbe,libertas usb8xxx)
-endef
-
-define KernelPackage/libertas-sdio
- $(call KernelPackage/mac80211/Default)
- DEPENDS+= +kmod-cfg80211 +kmod-lib80211 +kmod-mmc + at DRIVER_WEXT_SUPPORT @!TARGET_uml +libertas-sdio-firmware
- TITLE:=Marvell 88W8686 Wireless Driver
- DEFAULT:=n
- FILES:= \
- $(PKG_BUILD_DIR)/drivers/net/wireless/marvell/libertas/libertas.ko \
- $(PKG_BUILD_DIR)/drivers/net/wireless/marvell/libertas/libertas_sdio.ko
- AUTOLOAD:=$(call AutoProbe,libertas libertas_sdio)
-endef
-
-define KernelPackage/libertas-spi
- $(call KernelPackage/mac80211/Default)
- SUBMENU:=Wireless Drivers
- DEPENDS+= +kmod-cfg80211 +kmod-lib80211 + at DRIVER_WEXT_SUPPORT @!TARGET_uml +libertas-spi-firmware
- DEFAULT:=n
- KCONFIG := \
- CONFIG_SPI=y \
- CONFIG_SPI_MASTER=y
- TITLE:=Marvell 88W8686 SPI Wireless Driver
- FILES:= \
- $(PKG_BUILD_DIR)/drivers/net/wireless/marvell/libertas/libertas.ko \
- $(PKG_BUILD_DIR)/drivers/net/wireless/marvell/libertas/libertas_spi.ko
- AUTOLOAD:=$(call AutoProbe,libertas libertas_spi)
-endef
-
-
define KernelPackage/mwl8k
$(call KernelPackage/mac80211/Default)
TITLE:=Driver for Marvell TOPDOG 802.11 Wireless cards
diff --git a/package/kernel/mac80211/ralink.mk b/package/kernel/mac80211/ralink.mk
index 7bbdc1c22c..6646c09ee2 100644
--- a/package/kernel/mac80211/ralink.mk
+++ b/package/kernel/mac80211/ralink.mk
@@ -1,8 +1,6 @@
PKG_DRIVERS += \
rt2x00-lib rt2x00-pci rt2x00-usb rt2x00-mmio \
- rt2400-pci rt2500-pci rt2500-usb \
- rt2800-lib rt2800-mmio rt2800-pci rt2800-soc rt2800-usb \
- rt61-pci rt73-usb
+ rt2800-lib rt2800-mmio rt2800-pci rt2800-soc rt2800-usb
PKG_CONFIG_DEPENDS += \
CONFIG_PACKAGE_RT2X00_LIB_DEBUGFS \
@@ -96,30 +94,6 @@ $(call KernelPackage/rt2x00/Default)
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ralink/rt2x00/rt2800lib.ko
endef
-define KernelPackage/rt2400-pci
-$(call KernelPackage/rt2x00/Default)
- DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci +kmod-eeprom-93cx6
- TITLE+= (RT2400 PCI)
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ralink/rt2x00/rt2400pci.ko
- AUTOLOAD:=$(call AutoProbe,rt2400pci)
-endef
-
-define KernelPackage/rt2500-pci
-$(call KernelPackage/rt2x00/Default)
- DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci +kmod-eeprom-93cx6
- TITLE+= (RT2500 PCI)
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ralink/rt2x00/rt2500pci.ko
- AUTOLOAD:=$(call AutoProbe,rt2500pci)
-endef
-
-define KernelPackage/rt2500-usb
-$(call KernelPackage/rt2x00/Default)
- DEPENDS+= @USB_SUPPORT +kmod-rt2x00-usb
- TITLE+= (RT2500 USB)
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ralink/rt2x00/rt2500usb.ko
- AUTOLOAD:=$(call AutoProbe,rt2500usb)
-endef
-
define KernelPackage/rt2800-mmio
$(call KernelPackage/rt2x00/Default)
TITLE += (RT28xx/RT3xxx MMIO)
@@ -155,18 +129,3 @@ $(call KernelPackage/rt2x00/Default)
endef
-define KernelPackage/rt61-pci
-$(call KernelPackage/rt2x00/Default)
- DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci +kmod-eeprom-93cx6 +kmod-lib-crc-itu-t +rt61-pci-firmware
- TITLE+= (RT2x61 PCI)
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ralink/rt2x00/rt61pci.ko
- AUTOLOAD:=$(call AutoProbe,rt61pci)
-endef
-
-define KernelPackage/rt73-usb
- $(call KernelPackage/rt2x00/Default)
- DEPENDS+= @USB_SUPPORT +kmod-rt2x00-usb +kmod-lib-crc-itu-t +rt73-usb-firmware
- TITLE+= (RT73 USB)
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ralink/rt2x00/rt73usb.ko
- AUTOLOAD:=$(call AutoProbe,rt73usb)
-endef
diff --git a/package/kernel/mac80211/realtek.mk b/package/kernel/mac80211/realtek.mk
index 44c6c25b08..5aa9171bd3 100644
--- a/package/kernel/mac80211/realtek.mk
+++ b/package/kernel/mac80211/realtek.mk
@@ -1,12 +1,8 @@
PKG_DRIVERS += \
- rtl8180 rtl8187 \
rtlwifi rtlwifi-pci rtlwifi-btcoexist rtlwifi-usb rtl8192c-common \
rtl8192ce rtl8192se rtl8192de rtl8192cu rtl8723bs rtl8821ae \
rtl8xxxu rtw88
-config-$(call config_package,rtl8180) += RTL8180
-config-$(call config_package,rtl8187) += RTL8187
-
config-$(call config_package,rtlwifi) += RTL_CARDS RTLWIFI
config-$(call config_package,rtlwifi-pci) += RTLWIFI_PCI
config-$(call config_package,rtlwifi-btcoexist) += RTLBTCOEXIST
@@ -30,29 +26,6 @@ config-y += RTW88_8822BE RTW88_8822CE RTW88_8723DE
config-$(CONFIG_PACKAGE_RTW88_DEBUG) += RTW88_DEBUG
config-$(CONFIG_PACKAGE_RTW88_DEBUGFS) += RTW88_DEBUGFS
-define KernelPackage/rtl818x/Default
- $(call KernelPackage/mac80211/Default)
- TITLE:=Realtek Drivers for RTL818x devices
- URL:=https://wireless.wiki.kernel.org/en/users/drivers/rtl8187
- DEPENDS+= +kmod-eeprom-93cx6 +kmod-mac80211
-endef
-
-define KernelPackage/rtl8180
- $(call KernelPackage/rtl818x/Default)
- DEPENDS+= @PCI_SUPPORT
- TITLE+= (RTL8180 PCI)
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtl818x/rtl8180/rtl818x_pci.ko
- AUTOLOAD:=$(call AutoProbe,rtl818x_pci)
-endef
-
-define KernelPackage/rtl8187
-$(call KernelPackage/rtl818x/Default)
- DEPENDS+= @USB_SUPPORT +kmod-usb-core
- TITLE+= (RTL8187 USB)
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8187.ko
- AUTOLOAD:=$(call AutoProbe,rtl8187)
-endef
-
define KernelPackage/rtlwifi/config
config PACKAGE_RTLWIFI_DEBUG
bool "Realtek wireless debugging"
diff --git a/target/linux/bcm47xx/generic/profiles/100-Broadcom-b43.mk b/target/linux/bcm47xx/generic/profiles/100-Broadcom-b43.mk
index 8ff95b4dd9..a6c14cb33c 100644
--- a/target/linux/bcm47xx/generic/profiles/100-Broadcom-b43.mk
+++ b/target/linux/bcm47xx/generic/profiles/100-Broadcom-b43.mk
@@ -4,13 +4,13 @@
define Profile/Broadcom-b43
NAME:=Broadcom SoC, all Ethernet, BCM43xx WiFi (b43, default)
- PACKAGES:=kmod-b44 kmod-tg3 kmod-bgmac kmod-b43 kmod-b43legacy
+ PACKAGES:=kmod-b44 kmod-tg3 kmod-bgmac kmod-b43
endef
define Profile/Broadcom-b43/Description
Package set compatible with hardware any Broadcom BCM47xx or BCM535x
- SoC with Broadcom BCM43xx Wifi cards using the mac80211, b43 and
- b43legacy drivers and b44, tg3 or bgmac Ethernet driver.
+ SoC with Broadcom BCM43xx Wifi cards using the mac80211, b43 and b44,
+ tg3 or bgmac Ethernet driver.
endef
$(eval $(call Profile,Broadcom-b43))
diff --git a/target/linux/bcm47xx/generic/profiles/200-Broadcom-b44-b43.mk b/target/linux/bcm47xx/generic/profiles/200-Broadcom-b44-b43.mk
index 0231bff642..a1f8a0efb3 100644
--- a/target/linux/bcm47xx/generic/profiles/200-Broadcom-b44-b43.mk
+++ b/target/linux/bcm47xx/generic/profiles/200-Broadcom-b44-b43.mk
@@ -4,13 +4,13 @@
define Profile/Broadcom-b44-b43
NAME:=Broadcom SoC, b44 Ethernet, BCM43xx WiFi (b43, default)
- PACKAGES:=kmod-b44 kmod-b43 kmod-b43legacy
+ PACKAGES:=kmod-b44 kmod-b43
endef
define Profile/Broadcom-b44-b43/Description
Package set compatible with hardware older Broadcom BCM47xx or BCM535x
SoC with Broadcom BCM43xx Wifi cards using the mac80211, b43 and
- b43legacy drivers and b44 Ethernet driver.
+ b44 Ethernet driver.
endef
$(eval $(call Profile,Broadcom-b44-b43))
diff --git a/target/linux/bcm47xx/image/legacy.mk b/target/linux/bcm47xx/image/legacy.mk
index 4538813b91..448c5206f4 100644
--- a/target/linux/bcm47xx/image/legacy.mk
+++ b/target/linux/bcm47xx/image/legacy.mk
@@ -4,7 +4,7 @@
define Device/asus_wl-300g
DEVICE_MODEL := WL-300g
- DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
+ DEVICE_PACKAGES := kmod-b43
$(Device/asus)
PRODUCTID := "WL300g "
endef
@@ -78,7 +78,7 @@ TARGET_DEVICES += asus_wl-550ge
define Device/asus_wl-hdd25
DEVICE_MODEL := WL-HDD25
- DEVICE_PACKAGES := kmod-b43 kmod-b43legacy $(USB1_PACKAGES)
+ DEVICE_PACKAGES := kmod-b43 $(USB1_PACKAGES)
$(Device/asus)
PRODUCTID := "WLHDD "
endef
@@ -145,7 +145,7 @@ TARGET_DEVICES += linksys_wrt54g3gv2-vf
define Device/linksys_wrt54g
DEVICE_MODEL := WRT54G
- DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
+ DEVICE_PACKAGES := kmod-b43
$(Device/linksys)
DEVICE_ID := W54G
VERSION := 4.71.1
@@ -218,7 +218,7 @@ TARGET_DEVICES += linksys_wrt300n-v1
define Device/motorola_wa840g
DEVICE_MODEL := WA840G
- DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
+ DEVICE_PACKAGES := kmod-b43
$(Device/motorola)
MOTOROLA_DEVICE := 2
endef
@@ -226,7 +226,7 @@ TARGET_DEVICES += motorola_wa840g
define Device/motorola_we800g
DEVICE_MODEL := WE800G
- DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
+ DEVICE_PACKAGES := kmod-b43
$(Device/motorola)
MOTOROLA_DEVICE := 3
endef
@@ -234,7 +234,7 @@ TARGET_DEVICES += motorola_we800g
define Device/motorola_wr850g
DEVICE_MODEL := WR850G
- DEVICE_PACKAGES := kmod-b43 kmod-b43legacy
+ DEVICE_PACKAGES := kmod-b43
$(Device/motorola)
MOTOROLA_DEVICE := 1
endef
diff --git a/target/linux/bcm47xx/legacy/profiles/100-Broadcom-b43.mk b/target/linux/bcm47xx/legacy/profiles/100-Broadcom-b43.mk
index c54f11bb89..691513728c 100644
--- a/target/linux/bcm47xx/legacy/profiles/100-Broadcom-b43.mk
+++ b/target/linux/bcm47xx/legacy/profiles/100-Broadcom-b43.mk
@@ -4,13 +4,13 @@
define Profile/Broadcom-b43
NAME:=Broadcom SoC, all Ethernet, BCM43xx WiFi (b43, default)
- PACKAGES:=kmod-b43 kmod-b43legacy
+ PACKAGES:=kmod-b43
endef
define Profile/Broadcom-b43/Description
Package set compatible with hardware any Broadcom BCM47xx or BCM535x
SoC with Broadcom BCM43xx Wifi cards using the mac80211, b43 and
- b43legacy drivers and b44, tg3 or bgmac Ethernet driver.
+ b44, tg3 or bgmac Ethernet driver.
endef
$(eval $(call Profile,Broadcom-b43))
diff --git a/tools/Makefile b/tools/Makefile
index 1a65afdfca..5ba15c641b 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -17,7 +17,7 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
BUILD_ISL = y
endif
endif
-ifneq ($(CONFIG_SDK)$(CONFIG_PACKAGE_kmod-b43)$(CONFIG_PACKAGE_b43legacy-firmware)$(CONFIG_BRCMSMAC_USE_FW_FROM_WL),)
+ifneq ($(CONFIG_SDK)$(CONFIG_PACKAGE_kmod-b43)$(CONFIG_BRCMSMAC_USE_FW_FROM_WL),)
BUILD_B43_TOOLS = y
endif
More information about the lede-commits
mailing list