diff options
Diffstat (limited to 'target/linux/ar71xx/base-files/lib')
-rwxr-xr-x | target/linux/ar71xx/base-files/lib/ar71xx.sh | 11 | ||||
-rwxr-xr-x | target/linux/ar71xx/base-files/lib/upgrade/platform.sh | 17 |
2 files changed, 8 insertions, 20 deletions
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|\ |