diff --git a/package/lean/UnblockNeteaseMusic/Makefile b/package/lean/UnblockNeteaseMusic/Makefile index 1cd1c31f18..c2c945d585 100644 --- a/package/lean/UnblockNeteaseMusic/Makefile +++ b/package/lean/UnblockNeteaseMusic/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=UnblockNeteaseMusic -PKG_VERSION:=0.25.0 +PKG_VERSION:=0.25.3 PKG_RELEASE:=4 PKG_LICENSE:=MIT PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/nondanee/UnblockNeteaseMusic.git -PKG_SOURCE_VERSION:=17cddd06278d0915697b3a342a182ed5e240200d +PKG_SOURCE_VERSION:=610ff1716aa3698cd2e9391ff808a35a05719586 PKG_SOURCE_SUBDIR:=$(PKG_NAME) PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION).tar.gz diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile index 127469aa85..1cf9e61686 100644 --- a/package/lean/default-settings/Makefile +++ b/package/lean/default-settings/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=default-settings PKG_VERSION:=1.1 -PKG_RELEASE:=58 +PKG_RELEASE:=59 PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE diff --git a/package/lean/default-settings/files/zzz-default-settings b/package/lean/default-settings/files/zzz-default-settings index 4e146c799e..6da9731b97 100755 --- a/package/lean/default-settings/files/zzz-default-settings +++ b/package/lean/default-settings/files/zzz-default-settings @@ -33,6 +33,7 @@ sed -i 's#http://downloads.openwrt.org#https://mirrors.cloud.tencent.com/lede#g' sed -i 's#src/gz openwrt_luci https://mirrors.cloud.tencent.com/lede/snapshots#src/gz openwrt_luci https://mirrors.cloud.tencent.com/lede/releases/18.06.8#g' /etc/opkg/distfeeds.conf sed -i 's#src/gz openwrt_packages https://mirrors.cloud.tencent.com/lede/snapshots#src/gz openwrt_packages https://mirrors.cloud.tencent.com/lede/releases/18.06.8#g' /etc/opkg/distfeeds.conf sed -i "s/# //g" /etc/opkg/distfeeds.conf +sed -i '/openwrt_luci/ { s/snapshots/releases\/18.06.4/g; }' /etc/opkg/distfeeds.conf sed -i 's/root::0:0:99999:7:::/root:$1$V4UetPzk$CYXluq4wUazHjmCDBCqXF.:0:0:99999:7:::/g' /etc/shadow sed -i 's|root:x:0:0:root:/root:/bin/ash|root:x:0:0:root:/root:/bin/bash|g' /etc/passwd diff --git a/package/lean/k3-brcmfmac4366c-firmware/files/lib/firmware/brcm/brcmfmac4366c-pcie.bin b/package/lean/k3-brcmfmac4366c-firmware/files/lib/firmware/brcm/brcmfmac4366c-pcie.bin index 5439cdec01..19faa54db2 100644 Binary files a/package/lean/k3-brcmfmac4366c-firmware/files/lib/firmware/brcm/brcmfmac4366c-pcie.bin and b/package/lean/k3-brcmfmac4366c-firmware/files/lib/firmware/brcm/brcmfmac4366c-pcie.bin differ diff --git a/package/lean/luci-app-unblockmusic/root/etc/hotplug.d/iface/099-unblockmusic b/package/lean/luci-app-unblockmusic/root/etc/hotplug.d/iface/099-unblockmusic index 3a3c0d92c4..3caadee090 100755 --- a/package/lean/luci-app-unblockmusic/root/etc/hotplug.d/iface/099-unblockmusic +++ b/package/lean/luci-app-unblockmusic/root/etc/hotplug.d/iface/099-unblockmusic @@ -3,4 +3,5 @@ [ "$ACTION" = ifup ] || exit 0 sleep 10 +ipset flush music 2>/dev/null /usr/share/UnblockNeteaseMusic/getmusicip.sh diff --git a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic index 3fdc4f9a72..66dc0f97be 100755 --- a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic +++ b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic @@ -111,6 +111,7 @@ del_rule(){ $ipt_n -X CLOUD_MUSIC 2>/dev/null iptables -D OUTPUT -d 223.252.199.10 -j DROP 2>/dev/null + ipset flush music 2>/dev/null ipset -X music_http 2>/dev/null ipset -X music_https 2>/dev/null diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/logcheck.sh b/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/logcheck.sh index 8d53d96c34..7a6d487125 100755 --- a/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/logcheck.sh +++ b/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/logcheck.sh @@ -11,7 +11,6 @@ while true do icount=`busybox ps -w | grep UnblockNeteaseMusic | grep -v grep | grep -v logcheck.sh` if [ -z "$icount" ]; then - /usr/share/UnblockNeteaseMusic/getmusicip.sh /etc/init.d/unblockmusic restart fi log_size=$(expr $(ls -l $log_file | awk '{print $5}') / 1024) diff --git a/package/network/services/ppp/files/ppp.sh b/package/network/services/ppp/files/ppp.sh index 0fe29993e3..eea4220a34 100755 --- a/package/network/services/ppp/files/ppp.sh +++ b/package/network/services/ppp/files/ppp.sh @@ -234,7 +234,7 @@ proto_pppoe_setup() { #By 蝈蝈：并发拨号同步的前期准备 syncppp_option="" [ "$(uci get syncdial.config.enabled)" == "1" ] && { - ppp_if_cnt=$(cat /etc/config/network | grep -c "proto 'pppoe'") + ppp_if_cnt=$(cat /etc/config/network | grep -E -c "proto\s+?'pppoe'") syncppp_option="syncppp $ppp_if_cnt" shellsync $ppp_if_cnt 10 } diff --git a/package/network/utils/wireguard-tools/Makefile b/package/network/utils/wireguard-tools/Makefile index 1773261a28..3232060bd1 100644 --- a/package/network/utils/wireguard-tools/Makefile +++ b/package/network/utils/wireguard-tools/Makefile @@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wireguard-tools -PKG_VERSION:=1.0.20200510 +PKG_VERSION:=1.0.20200513 PKG_RELEASE:=1 PKG_SOURCE:=wireguard-tools-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-tools/snapshot/ -PKG_HASH:=cd526c7ea177e59ae4c0ebc4f3cc360b8524881b090d043426bdf7e3c85ac8e7 +PKG_HASH:=e73409a9fb8c90506db241d1e1a4e7372a60dbfa400e37f4ab2fd70a92ba495f PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds index 09c772d77b..b3613c9736 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -902,6 +902,9 @@ tl-wdr4900-v2) ucidef_set_led_wlan "wlan2g" "WLAN2G" "tp-link:blue:wlan2g" "phy0tpt" ucidef_set_led_wlan "wlan5g" "WLAN5G" "tp-link:blue:wlan5g" "phy1tpt" ;; +tl-wdr8500-v1) + ucidef_set_led_default "sys" "SYS" "tp-link:blue:system" "1" + ;; tl-wr885n-v1) ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth0" ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10" diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network index ad4c5b8c45..163d5abe47 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -209,6 +209,7 @@ ar71xx_setup_interfaces() ap132|\ ap136|\ ap152|\ + tl-wdr8500-v1|\ rb-750gl|\ rb-751g|\ rb-951g-2hnd|\ diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index 1fe5b013c4..4aa3548dbc 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -91,6 +91,7 @@ get_status_led() { tl-mr13u|\ tl-wdr4300|\ tl-wdr4900-v2|\ + tl-wdr8500-v1|\ tl-wr703n|\ tl-wr710n|\ tl-wr720n-v3|\ diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 0d72ca0c77..74f5d5423b 100644 --- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -234,6 +234,10 @@ case "$FIRMWARE" in ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \ /lib/firmware/ath10k/QCA9888/hw2.0/board.bin ;; + tl-wdr8500-v1) + ath10kcal_extract "art" 20480 12064 + ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -1) + ;; esac ;; *) diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 2eb9001d92..cc5b512895 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -302,6 +302,9 @@ tplink_board_detect() { "322000"*) model="TP-Link TL-MR3220" ;; + "322700"*) + model="TP-Link TL-WDR3227" + ;; "332000"*) model="TP-Link TL-WDR3320" ;; @@ -349,12 +352,12 @@ tplink_board_detect() { "751000"*) model="TP-Link TL-WA7510N" ;; + "85000001") + model="TP-Link TL-WDR8500" + ;; "934100"*) model="NC-LINK SMART-300" ;; - "322700"*) - model="TP-Link TL-WDR3227" - ;; "c50000"*) model="TP-Link Archer C5" ;; @@ -1301,6 +1304,9 @@ ar71xx_board_detect() { *"TL-WDR6500 v6") name="tl-wdr6500-v6" ;; + *"TL-WDR8500 v1") + name="tl-wdr8500-v1" + ;; *"TL-WPA8630") name="tl-wpa8630" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 2c5bf4eb9c..0f5a5df181 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -465,6 +465,7 @@ platform_check_image() { tl-wdr4900-v2|\ tl-wdr6500-v2|\ tl-wdr6500-v6|\ + tl-wdr8500-v1|\ tl-wpa8630|\ tl-wr1041n-v2|\ tl-wr1043nd|\ diff --git a/target/linux/ar71xx/config-4.14 b/target/linux/ar71xx/config-4.14 index 5be477c371..a659bc0626 100644 --- a/target/linux/ar71xx/config-4.14 +++ b/target/linux/ar71xx/config-4.14 @@ -144,6 +144,7 @@ CONFIG_ATH79=y # CONFIG_ATH79_MACH_LAN_TURTLE is not set # CONFIG_ATH79_MACH_LIMA is not set # CONFIG_ATH79_MACH_MC_MAC1200R is not set +# CONFIG_ATH79_MACH_MC_MW4530R is not set # CONFIG_ATH79_MACH_MR12 is not set # CONFIG_ATH79_MACH_MR16 is not set # CONFIG_ATH79_MACH_MR1750 is not set @@ -220,7 +221,8 @@ CONFIG_ATH79=y # CONFIG_ATH79_MACH_TL_WDR3500 is not set # CONFIG_ATH79_MACH_TL_WDR4300 is not set # CONFIG_ATH79_MACH_TL_WDR6500_V2 is not set -CONFIG_ATH79_MACH_TL_WDR6500_V6=y +# CONFIG_ATH79_MACH_TL_WDR6500_V6 is not set +# CONFIG_ATH79_MACH_TL_WDR8500_V1 is not set # CONFIG_ATH79_MACH_TL_WPA8630 is not set # CONFIG_ATH79_MACH_TL_WR1041N_V2 is not set # CONFIG_ATH79_MACH_TL_WR1043ND is not set @@ -244,6 +246,17 @@ CONFIG_ATH79_MACH_TL_WDR6500_V6=y # CONFIG_ATH79_MACH_TL_WR841N_V9 is not set # CONFIG_ATH79_MACH_TL_WR880N_V1 is not set # CONFIG_ATH79_MACH_TL_WR881N_V1 is not set +# CONFIG_ATH79_MACH_TL_WR882N_V1 is not set +# CONFIG_ATH79_MACH_TL_WR882N_V2 is not set +# CONFIG_ATH79_MACH_TL_WR882N_V3 is not set +# CONFIG_ATH79_MACH_TL_WR885N_V1 is not set +# CONFIG_ATH79_MACH_TL_WR885N_V2 is not set +# CONFIG_ATH79_MACH_TL_WR886N_V2 is not set +# CONFIG_ATH79_MACH_TL_WR886N_V3 is not set +# CONFIG_ATH79_MACH_TL_WR886N_V4 is not set +# CONFIG_ATH79_MACH_TL_WR886N_V5 is not set +# CONFIG_ATH79_MACH_TL_WR886N_V6 is not set +# CONFIG_ATH79_MACH_TL_WR886N_V7 is not set # CONFIG_ATH79_MACH_TL_WR902AC_V1 is not set # CONFIG_ATH79_MACH_TL_WR940N_V4 is not set # CONFIG_ATH79_MACH_TL_WR941ND is not set diff --git a/target/linux/ar71xx/config-4.9 b/target/linux/ar71xx/config-4.9 index 36d1c9867d..3b0faba53e 100644 --- a/target/linux/ar71xx/config-4.9 +++ b/target/linux/ar71xx/config-4.9 @@ -144,7 +144,7 @@ CONFIG_ATH79=y # CONFIG_ATH79_MACH_LAN_TURTLE is not set # CONFIG_ATH79_MACH_LIMA is not set # CONFIG_ATH79_MACH_MC_MAC1200R is not set -CONFIG_ATH79_MACH_MC_MW4530R=y +# CONFIG_ATH79_MACH_MC_MW4530R is not set # CONFIG_ATH79_MACH_MR12 is not set # CONFIG_ATH79_MACH_MR16 is not set # CONFIG_ATH79_MACH_MR1750 is not set @@ -221,7 +221,8 @@ CONFIG_ATH79_MACH_MC_MW4530R=y # CONFIG_ATH79_MACH_TL_WDR3500 is not set # CONFIG_ATH79_MACH_TL_WDR4300 is not set # CONFIG_ATH79_MACH_TL_WDR6500_V2 is not set -CONFIG_ATH79_MACH_TL_WDR6500_V6=y +# CONFIG_ATH79_MACH_TL_WDR6500_V6 is not set +# CONFIG_ATH79_MACH_TL_WDR8500_V1 is not set # CONFIG_ATH79_MACH_TL_WPA8630 is not set # CONFIG_ATH79_MACH_TL_WR1041N_V2 is not set # CONFIG_ATH79_MACH_TL_WR1043ND is not set diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt index 7e3aef940d..c6df0dce70 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt @@ -1896,6 +1896,16 @@ config ATH79_MACH_TL_WDR6500_V6 select ATH79_DEV_USB select ATH79_DEV_WMAC +config ATH79_MACH_TL_WDR8500_V1 + bool "TP-LINK TL-WDR8500 v1 board support" + select SOC_QCA956X + select ATH79_DEV_AP9X_PCI if PCI + select ATH79_DEV_ETH + select ATH79_DEV_GPIO_BUTTONS + select ATH79_DEV_LEDS_GPIO + select ATH79_DEV_M25P80 + select ATH79_DEV_WMAC + config ATH79_MACH_TL_WR703N bool "TP-LINK TL-WR703N/TL-WR710N/TL-MR10U support" select SOC_AR933X diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile index 52d0a912f4..bd7cbeab5f 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile +++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile @@ -107,7 +107,7 @@ obj-$(CONFIG_ATH79_MACH_DLAN_HOTSPOT) += mach-dlan-hotspot.o obj-$(CONFIG_ATH79_MACH_DLAN_PRO_1200_AC) += mach-dlan-pro-1200-ac.o obj-$(CONFIG_ATH79_MACH_DLAN_PRO_500_WP) += mach-dlan-pro-500-wp.o obj-$(CONFIG_ATH79_MACH_DOMYWIFI_DW33D) += mach-domywifi-dw33d.o -obj-$(CONFIG_ATH79_MACH_ARRIS_SBR_AC1750) += mach-sbr-ac1750.o +obj-$(CONFIG_ATH79_MACH_ARRIS_SBR_AC1750) += mach-sbr-ac1750.o obj-$(CONFIG_ATH79_MACH_DR342) += mach-dr344.o obj-$(CONFIG_ATH79_MACH_DR344) += mach-dr344.o obj-$(CONFIG_ATH79_MACH_DR531) += mach-dr531.o @@ -232,6 +232,7 @@ obj-$(CONFIG_ATH79_MACH_TL_WDR3500) += mach-tl-wdr3500.o obj-$(CONFIG_ATH79_MACH_TL_WDR4300) += mach-tl-wdr4300.o obj-$(CONFIG_ATH79_MACH_TL_WDR6500_V2) += mach-tl-wdr6500-v2.o obj-$(CONFIG_ATH79_MACH_TL_WDR6500_V6) += mach-tl-wdr6500-v6.o +obj-$(CONFIG_ATH79_MACH_TL_WDR8500_V1) += mach-tl-wdr8500-v1.o obj-$(CONFIG_ATH79_MACH_TL_WPA8630) += mach-tl-wpa8630.o obj-$(CONFIG_ATH79_MACH_TL_WR1041N_V2) += mach-tl-wr1041n-v2.o obj-$(CONFIG_ATH79_MACH_TL_WR1043ND) += mach-tl-wr1043nd.o diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr8500-v1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr8500-v1.c new file mode 100644 index 0000000000..b5b0e42055 --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr8500-v1.c @@ -0,0 +1,148 @@ +/* + * TP-LINK TL-WDR8500_V1 board support + * + * Copyright (C) 2018 mht + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "common.h" +#include "dev-eth.h" +#include "dev-gpio-buttons.h" +#include "dev-leds-gpio.h" +#include "dev-m25p80.h" +#include "dev-spi.h" +#include "dev-wmac.h" +#include "machtypes.h" +#include "pci.h" + +#define TL_WDR8500_V1_GPIO_BTN_RESET 1 +#define TL_WDR8500_V1_GPIO_BTN_TURBO 2 + +// tx = 18 / rx = 22 +#define TL_WDR8500_V1_GPIO_LED_TURBO 5 +#define TL_WDR8500_V1_GPIO_LED_SYS 21 + +#define TL_WDR8500_V1_KEYS_POLL_INTERVAL 20 /* msecs */ +#define TL_WDR8500_V1_KEYS_DEBOUNCE_INTERVAL (3 * TL_WDR8500_V1_KEYS_POLL_INTERVAL) + +#define TL_WDR8500_V1_WMAC_CALDATA_OFFSET 0x1000 + +#define TL_WDR8500_V1_GPIO_MDC 3 +#define TL_WDR8500_V1_GPIO_MDIO 4 + +// u-boot 128K +static const char *tl_wdr8500_v1_part_probes[] = { + "tp-link", + NULL, +}; + +static struct flash_platform_data tl_wdr8500_v1_flash_data = { + .part_probes = tl_wdr8500_v1_part_probes, +}; + +static struct gpio_led tl_wdr8500_v1_leds_gpio[] __initdata = { + { + .name = "tp-link:blue:system", + .gpio = TL_WDR8500_V1_GPIO_LED_SYS, + .active_low = 1, + }, { + .name = "tp-link:green:turbo", + .gpio = TL_WDR8500_V1_GPIO_LED_TURBO, + .active_low = 1, + }, +}; + +static struct gpio_keys_button tl_wdr8500_v1_gpio_keys[] __initdata = { + { + .desc = "RFKill button", + .type = EV_KEY, + .code = KEY_RFKILL, + .debounce_interval = TL_WDR8500_V1_KEYS_DEBOUNCE_INTERVAL, + .gpio = TL_WDR8500_V1_GPIO_BTN_TURBO, + .active_low = 1, + }, + { + .desc = "Reset button", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = TL_WDR8500_V1_KEYS_DEBOUNCE_INTERVAL, + .gpio = TL_WDR8500_V1_GPIO_BTN_RESET, + .active_low = 1, + }, +}; + +static struct ar8327_pad_cfg TL_WDR8500_v1_ar8337_pad0_cfg = { + .mode = AR8327_PAD_MAC_SGMII, + .sgmii_delay_en = true, +}; + +static struct ar8327_platform_data TL_WDR8500_v1_ar8337_data = { + .pad0_cfg = &TL_WDR8500_v1_ar8337_pad0_cfg, + .port0_cfg = { + .force_link = 1, + .speed = AR8327_PORT_SPEED_1000, + .duplex = 1, + .txpause = 1, + .rxpause = 1, + }, +}; + +static struct mdio_board_info TL_WDR8500_v1_mdio0_info[] = { + { + .bus_id = "ag71xx-mdio.0", + .phy_addr = 0, + .platform_data = &TL_WDR8500_v1_ar8337_data, + }, +}; + +static void __init TL_WDR8500_v1_setup(void) +{ + u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00); + u8 *art = (u8 *) KSEG1ADDR(0x1fff0000); + + ath79_register_m25p80(&tl_wdr8500_v1_flash_data); + + ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wdr8500_v1_leds_gpio), + tl_wdr8500_v1_leds_gpio); + + ath79_register_gpio_keys_polled(-1, TL_WDR8500_V1_KEYS_POLL_INTERVAL, + ARRAY_SIZE(tl_wdr8500_v1_gpio_keys), + tl_wdr8500_v1_gpio_keys); + + platform_device_register(&ath79_mdio0_device); + + ath79_register_mdio(1, 0x0); + + mdiobus_register_board_info(TL_WDR8500_v1_mdio0_info, + ARRAY_SIZE(TL_WDR8500_v1_mdio0_info)); + + ath79_register_wmac(art + TL_WDR8500_V1_WMAC_CALDATA_OFFSET, mac); + ath79_register_pci(); + + /* GMAC0 is connected to an AR8337 switch */ + ath79_init_mac(ath79_eth0_data.mac_addr, mac, -1); + ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII; + ath79_eth0_data.speed = SPEED_1000; + ath79_eth0_data.duplex = DUPLEX_FULL; + ath79_eth0_data.phy_mask = BIT(0); + ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev; + ath79_register_eth(0); +} + +MIPS_MACHINE(ATH79_MACH_TL_WDR8500_V1, "TL-WDR8500-v1", "TP-LINK TL-WDR8500 v1", + TL_WDR8500_v1_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h index 52e8a9a407..55a40155f1 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -101,7 +101,7 @@ enum ath79_mach_type { ATH79_MACH_DLAN_PRO_1200_AC, /* devolo dLAN pro 1200+ WiFi ac*/ ATH79_MACH_DLAN_PRO_500_WP, /* devolo dLAN pro 500 Wireless+ */ ATH79_MACH_DOMYWIFI_DW33D, /* DomyWifi DW33D */ - ATH79_MACH_ARRIS_SBR_AC1750, /* ARRIS SBR-AC1750 */ + ATH79_MACH_ARRIS_SBR_AC1750, /* ARRIS SBR-AC1750 */ ATH79_MACH_DR342, /* Wallys DR342 */ ATH79_MACH_DR344, /* Wallys DR344 */ ATH79_MACH_DR531, /* Wallys DR531 */ @@ -285,6 +285,7 @@ enum ath79_mach_type { ATH79_MACH_TL_WDR4900_V2, /* TP-LINK TL-WDR4900 v2 */ ATH79_MACH_TL_WDR6500_V2, /* TP-LINK TL-WDR6500 v2 */ ATH79_MACH_TL_WDR6500_V6, /* TP-LINK TL-WDR6500 v6 */ + ATH79_MACH_TL_WDR8500_V1, /* TP-LINK TL-WDR8500 v1 */ ATH79_MACH_TL_WPA8630, /* TP-Link TL-WPA8630 */ ATH79_MACH_TL_WR1041N_V2, /* TP-LINK TL-WR1041N v2 */ ATH79_MACH_TL_WR1043N_V5, /* TP-LINK TL-WR1043N v5 */ diff --git a/target/linux/ar71xx/generic/config-default b/target/linux/ar71xx/generic/config-default index e9b7488844..83cefccfba 100644 --- a/target/linux/ar71xx/generic/config-default +++ b/target/linux/ar71xx/generic/config-default @@ -35,6 +35,7 @@ CONFIG_ATH79_MACH_ARCHER_C60_V2=y CONFIG_ATH79_MACH_ARCHER_C7=y CONFIG_ATH79_MACH_ARDUINO_YUN=y CONFIG_ATH79_MACH_AW_NR580=y +CONFIG_ATH79_MACH_BHR_4GRV2=y CONFIG_ATH79_MACH_BHU_BXU2000N2_A=y CONFIG_ATH79_MACH_BSB=y CONFIG_ATH79_MACH_C55=y @@ -112,6 +113,7 @@ CONFIG_ATH79_MACH_KOALA=y CONFIG_ATH79_MACH_LAN_TURTLE=y CONFIG_ATH79_MACH_LIMA=y CONFIG_ATH79_MACH_MC_MAC1200R=y +CONFIG_ATH79_MACH_MC_MW4530R=y CONFIG_ATH79_MACH_MR12=y CONFIG_ATH79_MACH_MR16=y CONFIG_ATH79_MACH_MR1750=y @@ -160,6 +162,8 @@ CONFIG_ATH79_MACH_TL_WDR3227_V2=y CONFIG_ATH79_MACH_TL_WDR3500=y CONFIG_ATH79_MACH_TL_WDR4300=y CONFIG_ATH79_MACH_TL_WDR6500_V2=y +CONFIG_ATH79_MACH_TL_WDR6500_V6=y +CONFIG_ATH79_MACH_TL_WDR8500_V1=y CONFIG_ATH79_MACH_TL_WPA8630=y CONFIG_ATH79_MACH_TL_WR1043ND=y CONFIG_ATH79_MACH_TL_WR1043ND_V2=y diff --git a/target/linux/ar71xx/image/generic-tp-link.mk b/target/linux/ar71xx/image/generic-tp-link.mk index a2142f58c0..9f6628c299 100644 --- a/target/linux/ar71xx/image/generic-tp-link.mk +++ b/target/linux/ar71xx/image/generic-tp-link.mk @@ -354,7 +354,7 @@ endef TARGET_DEVICES += tl-wdr6500-v2 define Device/tl-wdr6500-v6 -$(Device/tplink-8mlzma) + $(Device/tplink-8mlzma) DEVICE_TITLE := TP-LINK TL-WDR6500 v6 DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca9888 KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma @@ -366,6 +366,21 @@ $(Device/tplink-8mlzma) endef TARGET_DEVICES += tl-wdr6500-v6 +define Device/tl-wdr8500-v1 + $(Device/tplink-8mlzma) + DEVICE_TITLE := TP-LINK TL-WDR8500 v1 + DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca9984 + KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma + KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | uImage lzma | tplink-v1-header + BOARDNAME := TL-WDR8500-v1 + DEVICE_PROFILE := TLWDR8500V1 + TPLINK_HWID := 0x85000001 + TPLINK_HEADER_VERSION := 1 + TPLINK_BOARD_ID := TL-WDR8500-V1 + SUPPORTED_DEVICES := tl-wdr8500-v1 +endef +TARGET_DEVICES += tl-wdr8500-v1 + define Device/tl-wpa8630-v1 $(Device/tplink-8mlzma) DEVICE_TITLE := TP-LINK TL-WPA8630 v1