From 4e4ee4649553ab536225060a27fc320bf54e458c Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 7 Aug 2020 15:25:12 +0200 Subject: ar71xx: drop target This target has been mostly replaced by ath79 and won't be included in the upcoming release anymore. Finally put it to rest. This also removes all references in packages, tools, etc. as well as the uboot-ar71xx and vsc73x5-ucode packages. Signed-off-by: Adrian Schmutzler --- package/kernel/linux/modules/usb.mk | 2 +- package/kernel/mac80211/ath.mk | 9 +++--- package/kernel/om-watchdog/Makefile | 2 +- package/kernel/om-watchdog/files/om-watchdog.init | 36 +---------------------- 4 files changed, 7 insertions(+), 42 deletions(-) (limited to 'package/kernel') diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index fc411c5a54..ff5d54daab 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -1576,7 +1576,7 @@ $(eval $(call KernelPackage,usbip-server)) define KernelPackage/usb-chipidea TITLE:=Host and device support for Chipidea controllers - DEPENDS:=+USB_GADGET_SUPPORT:kmod-usb-gadget @TARGET_ar71xx||TARGET_ath79 +kmod-usb-ehci +kmod-usb-phy-nop + DEPENDS:=+USB_GADGET_SUPPORT:kmod-usb-gadget @TARGET_ath79 +kmod-usb-ehci +kmod-usb-phy-nop KCONFIG:= \ CONFIG_EXTCON \ CONFIG_USB_CHIPIDEA \ diff --git a/package/kernel/mac80211/ath.mk b/package/kernel/mac80211/ath.mk index e52c18ec8c..5db4be8daa 100644 --- a/package/kernel/mac80211/ath.mk +++ b/package/kernel/mac80211/ath.mk @@ -40,7 +40,6 @@ config-$(CONFIG_PACKAGE_ATH_DYNACK) += ATH9K_DYNACK config-$(call config_package,ath9k) += ATH9K config-$(call config_package,ath9k-common) += ATH9K_COMMON config-$(call config_package,owl-loader) += ATH9K_PCI_NO_EEPROM -config-$(CONFIG_TARGET_ar71xx) += ATH9K_AHB config-$(CONFIG_TARGET_ath79) += ATH9K_AHB config-$(CONFIG_TARGET_ipq40xx) += ATH10K_AHB config-$(CONFIG_PCI) += ATH9K_PCI @@ -122,7 +121,7 @@ endef define KernelPackage/ath $(call KernelPackage/mac80211/Default) TITLE:=Atheros common driver part - DEPENDS+= @PCI_SUPPORT||USB_SUPPORT||TARGET_ar71xx||TARGET_ath79||TARGET_ath25 +kmod-mac80211 + DEPENDS+= @PCI_SUPPORT||USB_SUPPORT||TARGET_ath79||TARGET_ath25 +kmod-mac80211 FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath.ko MENU:=1 endef @@ -187,7 +186,7 @@ define KernelPackage/ath9k-common TITLE:=Atheros 802.11n wireless devices (common code for ath9k and ath9k_htc) URL:=https://wireless.wiki.kernel.org/en/users/drivers/ath9k HIDDEN:=1 - DEPENDS+= @PCI_SUPPORT||USB_SUPPORT||TARGET_ar71xx||TARGET_ath79 +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11W_SUPPORT + DEPENDS+= @PCI_SUPPORT||USB_SUPPORT||TARGET_ath79 +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11W_SUPPORT FILES:= \ $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_common.ko \ $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_hw.ko @@ -197,7 +196,7 @@ define KernelPackage/ath9k $(call KernelPackage/mac80211/Default) TITLE:=Atheros 802.11n PCI wireless cards support URL:=https://wireless.wiki.kernel.org/en/users/drivers/ath9k - DEPENDS+= @PCI_SUPPORT||TARGET_ar71xx||TARGET_ath79 +kmod-ath9k-common + DEPENDS+= @PCI_SUPPORT||TARGET_ath79 +kmod-ath9k-common FILES:= \ $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k.ko AUTOLOAD:=$(call AutoProbe,ath9k) @@ -226,7 +225,7 @@ define KernelPackage/ath9k/config config ATH9K_UBNTHSR bool "Support for Ubiquiti UniFi Outdoor+ access point" - depends on PACKAGE_kmod-ath9k && (TARGET_ar71xx_generic||TARGET_ath79) + depends on PACKAGE_kmod-ath9k && TARGET_ath79 default y endef diff --git a/package/kernel/om-watchdog/Makefile b/package/kernel/om-watchdog/Makefile index 6f2ac372fb..b0de3de74e 100644 --- a/package/kernel/om-watchdog/Makefile +++ b/package/kernel/om-watchdog/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=om-watchdog -PKG_RELEASE:=3 +PKG_RELEASE:=4 include $(INCLUDE_DIR)/package.mk diff --git a/package/kernel/om-watchdog/files/om-watchdog.init b/package/kernel/om-watchdog/files/om-watchdog.init index 12ff665837..8cbac043e4 100644 --- a/package/kernel/om-watchdog/files/om-watchdog.init +++ b/package/kernel/om-watchdog/files/om-watchdog.init @@ -13,41 +13,7 @@ PROG=/sbin/om-watchdog get_gpio() { local board=$(board_name) - if [ -r /lib/ar71xx.sh ]; then - case "$board" in - "a40"|\ - "a60"|\ - "mr1750"|\ - "mr1750v2"|\ - "mr900"|\ - "mr900v2") - return 16 - ;; - "mr600v2") - return 15 - ;; - "om2p"|\ - "om2p-hs"|\ - "om2p-hsv2"|\ - "om2p-hsv3"|\ - "om2p-hsv4"|\ - "om2pv4"|\ - "om5p-acv2") - return 12 - ;; - "om2p-lc"|\ - "om2pv2") - return 26 - ;; - "om5p"|\ - "om5p-an") - return 11 - ;; - "om5p-ac") - return 17 - ;; - esac - elif [ "$board" = "teltonika,rut5xx" ]; then + if [ "$board" = "teltonika,rut5xx" ]; then # ramips return 11 else -- cgit v1.2.3