From c79b796280fa5cd64bac663f9d5e5d9a737c30d6 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 6 Aug 2019 12:20:05 +0200 Subject: ar71xx: improve support for TP-Link CPE510 v2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes commit bae927c551fd ("ar71xx: add support for TP-LINK CPE510 V2.0") where the support for this device wasn't optimal. Device support for the CPE510v2 so far has been a hack to enable flashing with CPE510v1 images. Those even have different hardware (e.g. additional ethernet port). With this patch, we provide proper support for this device in ar71xx. Installation: - Flash factory image through stock firmware WEB UI or through TFTP - To get to TFTP recovery just hold reset button while powering on for around 4-5 seconds and release. - Rename factory image to recovery.bin - Stock TFTP server IP: 192.168.0.100 - Stock device TFTP address: 192.168.0.254 Fixes: bae927c551fd ("ar71xx: add support for TP-LINK CPE510 V2.0") Signed-off-by: Andrew Cameron [Rebased onto revert commit, changed comments in mach-cpe510.c, changed commit title and description, fixed eth0 MAC address, removed eth1 initialization] Signed-off-by: Adrian Schmutzler [squashed revert, added fixes tag] Signed-off-by: Petr Štetiar --- target/linux/ar71xx/base-files/etc/board.d/01_leds | 4 +++- target/linux/ar71xx/base-files/etc/board.d/02_network | 1 + target/linux/ar71xx/base-files/lib/ar71xx.sh | 11 ++++------- target/linux/ar71xx/base-files/lib/upgrade/platform.sh | 17 ++++------------- 4 files changed, 12 insertions(+), 21 deletions(-) (limited to 'target/linux/ar71xx/base-files') 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 8fc6fc8eea..0a63820de7 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -255,6 +255,7 @@ cpe210|\ cpe210-v2|\ cpe210-v3|\ cpe510|\ +cpe510-v2|\ wbs210|\ wbs510) ucidef_set_rssimon "wlan0" "200000" "1" @@ -265,7 +266,8 @@ wbs510) case "$board" in cpe210-v2|\ - cpe210-v3) + cpe210-v3|\ + cpe510-v2) ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan0" "eth0" ;; *) 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 78825af597..5307dd23f2 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -76,6 +76,7 @@ ar71xx_setup_interfaces() cf-e380ac-v2|\ cpe210-v2|\ cpe210-v3|\ + cpe510-v2|\ dr342|\ eap120|\ eap300v2|\ diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 894835b14d..03dfbcebf9 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -760,14 +760,11 @@ ar71xx_board_detect() { ;; *"CPE510/520") name="cpe510" + tplink_pharos_board_detect "$(tplink_pharos_get_model_string | tr -d '\r')" + ;; + *"CPE510 v2") + name="cpe510-v2" tplink_pharos_board_detect "$(tplink_pharos_v2_get_model_string)" - case $AR71XX_MODEL in - 'TP-Link CPE510 v2.0') - ;; - *) - tplink_pharos_board_detect "$(tplink_pharos_get_model_string | tr -d '\r')" - ;; - esac ;; *"CPE830") name="cpe830" diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index b995cdf123..d5570fdf18 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -586,6 +586,7 @@ platform_check_image() { return $? ;; cpe210|\ + cpe510|\ eap120|\ wbs210|\ wbs510) @@ -597,19 +598,9 @@ platform_check_image() { tplink_pharos_check_image "$1" "01000000" "$(tplink_pharos_v2_get_model_string)" '\0\xff\r' && return 0 return 1 ;; - cpe510) - local modelstr="$(tplink_pharos_v2_get_model_string)" - tplink_pharos_board_detect $modelstr - case $AR71XX_MODEL in - 'TP-Link CPE510 v2.0') - tplink_pharos_check_image "$1" "7f454c46" "$modelstr" '\0\xff\r' && return 0 - return 1 - ;; - *) - tplink_pharos_check_image "$1" "7f454c46" "$(tplink_pharos_get_model_string)" '' && return 0 - return 1 - ;; - esac + cpe510-v2) + tplink_pharos_check_image "$1" "7f454c46" "$(tplink_pharos_v2_get_model_string)" '\0\xff\r' && return 0 + return 1 ;; a40|\ a60|\ -- cgit v1.2.3