domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ramips: Improve compatible for TP-Link Archer devices

Browse Source 
Include "Archer" in compatible as it is part of the device name.

Update Makefile device names where necessary to match compatible.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler
2019-07-03 23:21:54 +02:00
committed by Daniel Golle
parent dcb5cf85c8
commit d93969a13a
13 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
target/linux/ramips/base-files/etc/board.d/01_leds
View File

@@ -330,23 +330,23 @@ tplink,tl-wr841n-v14)
ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e" ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e"
ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01" ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01"
;; ;;
tplink,c2-v1) tplink,archer-c2-v1)
ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch1" "0x1e" ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch1" "0x1e"
ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch1" "0x01" ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch1" "0x01"
set_wifi_led "$boardname:green:wlan" set_wifi_led "$boardname:green:wlan"
;; ;;
tplink,c20-v1) tplink,archer-c20-v1)
ucidef_set_led_switch "lan" "lan" "$boardname:blue:lan" "switch0" "0x1e" ucidef_set_led_switch "lan" "lan" "$boardname:blue:lan" "switch0" "0x1e"
ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x01" ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x01"
ucidef_set_led_netdev "wlan2g" "wlan2g" "$boardname:blue:wlan2g" "wlan0" ucidef_set_led_netdev "wlan2g" "wlan2g" "$boardname:blue:wlan2g" "wlan0"
;; ;;
tplink,c20-v4) tplink,archer-c20-v4)
ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e" ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e"
ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01" ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01"
ucidef_set_led_netdev "wlan2g" "wlan2g" "$boardname:green:wlan2g" "wlan0" ucidef_set_led_netdev "wlan2g" "wlan2g" "$boardname:green:wlan2g" "wlan0"
;; ;;
tplink,c50-v3|\ tplink,archer-c50-v3|\
tplink,c50-v4) tplink,archer-c50-v4)
ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e" ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e"
ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01" ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01"
ucidef_set_led_wlan "wlan2g" "wlan2g" "$boardname:green:wlan2g" "phy0tpt" ucidef_set_led_wlan "wlan2g" "wlan2g" "$boardname:green:wlan2g" "phy0tpt"

10
target/linux/ramips/base-files/etc/board.d/02_network
View File

@@ -238,9 +238,9 @@ ramips_setup_interfaces()
mzk-wdpr|\ mzk-wdpr|\
rt-n14u|\ rt-n14u|\
skylab,skw92a|\ skylab,skw92a|\
tplink,c20-v4|\ tplink,archer-c20-v4|\
tplink,c50-v3|\ tplink,archer-c50-v3|\
tplink,c50-v4|\ tplink,archer-c50-v4|\
tplink,tl-mr3420-v5|\ tplink,tl-mr3420-v5|\
tplink,tl-wr842n-v5|\ tplink,tl-wr842n-v5|\
tl-wr840n-v4|\ tl-wr840n-v4|\
@@ -261,7 +261,7 @@ ramips_setup_interfaces()
"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0"
;; ;;
c50|\ c50|\
tplink,c20-v1) tplink,archer-c20-v1)
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \
"1:lan:3" "2:lan:4" "3:lan:1" "4:lan:2" "0:wan" "6@eth0" "1:lan:3" "2:lan:4" "3:lan:1" "4:lan:2" "0:wan" "6@eth0"
;; ;;
@@ -324,7 +324,7 @@ ramips_setup_interfaces()
"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0" "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0"
;; ;;
edimax,br-6478ac-v2|\ edimax,br-6478ac-v2|\
tplink,c2-v1) tplink,archer-c2-v1)
ucidef_add_switch "switch1" \ ucidef_add_switch "switch1" \
"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0"
;; ;;

2
target/linux/ramips/base-files/lib/upgrade/platform.sh
View File

@@ -45,7 +45,7 @@ platform_do_upgrade() {
xiaomi,mir3p) xiaomi,mir3p)
nand_do_upgrade "$ARGV" nand_do_upgrade "$ARGV"
;; ;;
tplink,c50-v4) tplink,archer-c50-v4)
MTD_ARGS="-t romfile" MTD_ARGS="-t romfile"
default_do_upgrade "$ARGV" default_do_upgrade "$ARGV"
;; ;;

2
target/linux/ramips/dts/ArcherC2-v1.dts
View File

@@ -6,7 +6,7 @@
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
/ { / {
compatible = "tplink,c2-v1", "ralink,mt7620a-soc"; compatible = "tplink,archer-c2-v1", "ralink,mt7620a-soc";
model = "TP-Link Archer C2 v1"; model = "TP-Link Archer C2 v1";
aliases { aliases {

2
target/linux/ramips/dts/ArcherC20i.dts
View File

@@ -6,7 +6,7 @@
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
/ { / {
compatible = "tplink,c20i", "ralink,mt7620a-soc"; compatible = "tplink,archer-c20i", "ralink,mt7620a-soc";
model = "TP-Link Archer C20i"; model = "TP-Link Archer C20i";
chosen { chosen {

2
target/linux/ramips/dts/ArcherC20v1.dts
View File

@@ -6,7 +6,7 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
/ { / {
compatible = "tplink,c20-v1", "ralink,mt7620a-soc"; compatible = "tplink,archer-c20-v1", "ralink,mt7620a-soc";
model = "TP-Link Archer C20 v1"; model = "TP-Link Archer C20 v1";
aliases { aliases {

2
target/linux/ramips/dts/ArcherC20v4.dts
View File

@@ -6,7 +6,7 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
/ { / {
compatible = "tplink,c20-v4", "mediatek,mt7628an-soc"; compatible = "tplink,archer-c20-v4", "mediatek,mt7628an-soc";
model = "TP-Link Archer C20 v4"; model = "TP-Link Archer C20 v4";
aliases { aliases {

4
target/linux/ramips/dts/ArcherC50.dts
View File

@@ -6,8 +6,8 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
/ { / {
compatible = "tplink,c50", "ralink,mt7620a-soc"; compatible = "tplink,archer-c50-v1", "ralink,mt7620a-soc";
model = "TP-Link Archer C50"; model = "TP-Link Archer C50 v1";
aliases { aliases {
led-boot = &led_power; led-boot = &led_power;

2
target/linux/ramips/dts/ArcherC50V3.dts
View File

@@ -6,7 +6,7 @@
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
/ { / {
compatible = "tplink,c50-v3", "mediatek,mt7628an-soc"; compatible = "tplink,archer-c50-v3", "mediatek,mt7628an-soc";
model = "TP-Link Archer C50 v3"; model = "TP-Link Archer C50 v3";
aliases { aliases {

2
target/linux/ramips/dts/ArcherC50V4.dts
View File

@@ -7,7 +7,7 @@
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
/ { / {
compatible = "tplink,c50-v4", "mediatek,mt7628an-soc"; compatible = "tplink,archer-c50-v4", "mediatek,mt7628an-soc";
model = "TP-Link Archer C50 v4"; model = "TP-Link Archer C50 v4";
aliases { aliases {

2
target/linux/ramips/dts/ArcherMR200.dts
View File

@@ -6,7 +6,7 @@
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
/ { / {
compatible = "tplink,mr200", "ralink,mt7620a-soc"; compatible = "tplink,archer-mr200", "ralink,mt7620a-soc";
model = "TP-Link Archer MR200"; model = "TP-Link Archer MR200";
aliases { aliases {

10
target/linux/ramips/image/mt7620.mk
View File

@@ -729,9 +729,10 @@ define Device/edimax_ew-7478apc
endef endef
TARGET_DEVICES += edimax_ew-7478apc TARGET_DEVICES += edimax_ew-7478apc
define Device/tplink_c2-v1 define Device/tplink_archer-c2-v1
$(Device/Archer) $(Device/Archer)
DTS := ArcherC2-v1 DTS := ArcherC2-v1
SUPPORTED_DEVICES += tplink,c2-v1
TPLINK_FLASHLAYOUT := 8Mmtk TPLINK_FLASHLAYOUT := 8Mmtk
TPLINK_HWID := 0xc7500001 TPLINK_HWID := 0xc7500001
TPLINK_HWREV := 50 TPLINK_HWREV := 50
@@ -740,11 +741,12 @@ define Device/tplink_c2-v1
DEVICE_VARIANT := v1 DEVICE_VARIANT := v1
DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport kmod-switch-rtl8366-smi kmod-switch-rtl8367b DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport kmod-switch-rtl8366-smi kmod-switch-rtl8367b
endef endef
TARGET_DEVICES += tplink_c2-v1 TARGET_DEVICES += tplink_archer-c2-v1
define Device/tplink_c20-v1 define Device/tplink_archer-c20-v1
$(Device/Archer) $(Device/Archer)
DTS := ArcherC20v1 DTS := ArcherC20v1
SUPPORTED_DEVICES += tplink,c20-v1
TPLINK_FLASHLAYOUT := 8Mmtk TPLINK_FLASHLAYOUT := 8Mmtk
TPLINK_HWID := 0xc2000001 TPLINK_HWID := 0xc2000001
TPLINK_HWREV := 0x44 TPLINK_HWREV := 0x44
@@ -754,7 +756,7 @@ define Device/tplink_c20-v1
DEVICE_VARIANT := v1 DEVICE_VARIANT := v1
DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport
endef endef
TARGET_DEVICES += tplink_c20-v1 TARGET_DEVICES += tplink_archer-c20-v1
define Device/vonets_var11n-300 define Device/vonets_var11n-300
DTS := VAR11N-300 DTS := VAR11N-300

15
target/linux/ramips/image/mt76x8.mk
View File

@@ -302,7 +302,7 @@ define Device/tplink_tl-wr841n-v14
endef endef
TARGET_DEVICES += tplink_tl-wr841n-v14 TARGET_DEVICES += tplink_tl-wr841n-v14
define Device/tplink_c20-v4 define Device/tplink_archer-c20-v4
$(Device/tplink) $(Device/tplink)
DTS := ArcherC20v4 DTS := ArcherC20v4
IMAGE_SIZE := 7808k IMAGE_SIZE := 7808k
@@ -314,10 +314,11 @@ define Device/tplink_c20-v4
TPLINK_HWREVADD := 0x4 TPLINK_HWREVADD := 0x4
TPLINK_HVERSION := 3 TPLINK_HVERSION := 3
DEVICE_PACKAGES := kmod-mt76x0e DEVICE_PACKAGES := kmod-mt76x0e
SUPPORTED_DEVICES += tplink,c20-v4
endef endef
TARGET_DEVICES += tplink_c20-v4 TARGET_DEVICES += tplink_archer-c20-v4
define Device/tplink_c50-v3 define Device/tplink_archer-c50-v3
$(Device/tplink) $(Device/tplink)
DTS := ArcherC50V3 DTS := ArcherC50V3
IMAGE_SIZE := 7808k IMAGE_SIZE := 7808k
@@ -329,10 +330,11 @@ define Device/tplink_c50-v3
TPLINK_HWREVADD := 0x1 TPLINK_HWREVADD := 0x1
TPLINK_HVERSION := 3 TPLINK_HVERSION := 3
DEVICE_PACKAGES := kmod-mt76x2 DEVICE_PACKAGES := kmod-mt76x2
SUPPORTED_DEVICES += tplink,c50-v3
endef endef
TARGET_DEVICES += tplink_c50-v3 TARGET_DEVICES += tplink_archer-c50-v3
define Device/tplink_c50-v4 define Device/tplink_archer-c50-v4
$(Device/tplink) $(Device/tplink)
DTS := ArcherC50V4 DTS := ArcherC50V4
IMAGE_SIZE := 7616k IMAGE_SIZE := 7616k
@@ -345,8 +347,9 @@ define Device/tplink_c50-v4
TPLINK_HVERSION := 3 TPLINK_HVERSION := 3
DEVICE_PACKAGES := kmod-mt76x2 DEVICE_PACKAGES := kmod-mt76x2
IMAGES := sysupgrade.bin IMAGES := sysupgrade.bin
SUPPORTED_DEVICES += tplink,c50-v4
endef endef
TARGET_DEVICES += tplink_c50-v4 TARGET_DEVICES += tplink_archer-c50-v4
define Device/tplink_tl-mr3020-v3 define Device/tplink_tl-mr3020-v3
$(Device/tplink) $(Device/tplink)