hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ar71xx: improve support for TP-Link CPE510 v2 

This fixes commit bae927c551 ("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: bae927c551 ("ar71xx: add support for TP-LINK CPE510 V2.0")
Signed-off-by: Andrew Cameron <apcameron@softhome.net>
[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 <freifunk@adrianschmutzler.de>
[squashed revert, added fixes tag]
Signed-off-by: Petr Štetiar <ynezz@true.cz>
(cherry picked from commit c79b796280)
[added CPE510V2 entry to tplink-safeloader.c]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
openwrt-19.07
Adrian Schmutzler 2019-08-06 12:20:05 +02:00
parent 0c9be4f76b
commit b3514e3569
8 changed files with 87 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/ar71xx/base-files/etc/board.d/01_leds
View File

@ -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"
;;
*)

1
target/linux/ar71xx/base-files/etc/board.d/02_network
View File

@ -76,6 +76,7 @@ ar71xx_setup_interfaces()
cf-e380ac-v2|\
cpe210-v2|\
cpe210-v3|\
cpe510-v2|\
dr342|\
eap120|\
eap300v2|\

11
target/linux/ar71xx/base-files/lib/ar71xx.sh
View File

@ -763,14 +763,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"

17
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
View File

@ -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|\

32
target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c
View File

@ -230,6 +230,35 @@ static void __init cpe210_v2_setup(void)
ath79_register_wmac(ee, mac);
}
static void __init cpe510_v2_setup(void)
{
u8 *mac = (u8 *) KSEG1ADDR(0x1f830008);
u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
/* disable PHY_SWAP and PHY_ADDR_SWAP bits */
ath79_setup_ar933x_phy4_switch(false, false);
ath79_register_leds_gpio(-1, ARRAY_SIZE(cpe210_v2_leds_gpio),
cpe210_v2_leds_gpio);
ath79_register_gpio_keys_polled(-1, CPE510_KEYS_POLL_INTERVAL,
ARRAY_SIZE(cpe510_gpio_keys),
cpe510_gpio_keys);
ath79_register_m25p80(NULL);
ath79_register_mdio(1, 0x0);
/* LAN port */
ath79_switch_data.phy4_mii_en = 1;
ath79_switch_data.phy_poll_mask = BIT(4);
ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
ath79_eth0_data.phy_mask = BIT(4);
ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev;
ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
ath79_register_eth(0);
ath79_register_wmac(ee, mac);
}
MIPS_MACHINE(ATH79_MACH_CPE210, "CPE210", "TP-LINK CPE210/220",
cpe210_setup);
@ -242,6 +271,9 @@ MIPS_MACHINE(ATH79_MACH_CPE210_V3, "CPE210V3", "TP-LINK CPE210 v3",
MIPS_MACHINE(ATH79_MACH_CPE510, "CPE510", "TP-LINK CPE510/520",
cpe510_setup);
MIPS_MACHINE(ATH79_MACH_CPE510_V2, "CPE510V2", "TP-LINK CPE510 v2",
cpe510_v2_setup);
MIPS_MACHINE(ATH79_MACH_WBS210, "WBS210", "TP-LINK WBS210",
wbs_setup);

1
target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
View File

@ -79,6 +79,7 @@ enum ath79_mach_type {
ATH79_MACH_CPE210_V3, /* TP-LINK CPE210 v3 */
ATH79_MACH_CPE505N, /* P&W CPE505N */
ATH79_MACH_CPE510, /* TP-LINK CPE510 */
ATH79_MACH_CPE510_V2, /* TP-LINK CPE510 v2 */
ATH79_MACH_CPE830, /* YunCore CPE830 */
ATH79_MACH_CPE870, /* YunCore CPE870 */
ATH79_MACH_CR3000, /* PowerCloud Systems CR3000 */

8
target/linux/ar71xx/image/generic-tp-link.mk
View File

@ -177,6 +177,14 @@ define Device/cpe510-520-v1
endef
TARGET_DEVICES += cpe510-520-v1
define Device/cpe510-v2
$(Device/cpe510-520-v1)
DEVICE_TITLE := TP-LINK CPE510 v2
BOARDNAME := CPE510V2
TPLINK_BOARD_ID := CPE510V2
endef
TARGET_DEVICES += cpe510-v2
define Device/cpe210-220-v1
$(Device/cpe510-520-v1)
DEVICE_TITLE := TP-LINK CPE210/220 v1

36
tools/firmware-utils/src/tplink-safeloader.c
View File

@ -231,7 +231,7 @@ static struct device_info boards[] = {
.last_sysupgrade_partition = "support-list",
},
/** Firmware layout for the CPE510/520 */
/** Firmware layout for the CPE510/520 V1 */
{
.id = "CPE510",
.vendor = "CPE510(TP-LINK|UN|N300-5):1.0\r\n",
@ -244,13 +244,45 @@ static struct device_info boards[] = {
"CPE510(TP-LINK|EU|N300-5):1.1\r\n"
"CPE520(TP-LINK|UN|N300-5):1.1\r\n"
"CPE520(TP-LINK|US|N300-5):1.1\r\n"
"CPE520(TP-LINK|EU|N300-5):1.1\r\n"
"CPE520(TP-LINK|EU|N300-5):1.1\r\n",
.support_trail = '\xff',
.soft_ver = NULL,
.partitions = {
{"fs-uboot", 0x00000, 0x20000},
{"partition-table", 0x20000, 0x02000},
{"default-mac", 0x30000, 0x00020},
{"product-info", 0x31100, 0x00100},
{"signature", 0x32000, 0x00400},
{"os-image", 0x40000, 0x1c0000},
{"file-system", 0x200000, 0x5b0000},
{"soft-version", 0x7b0000, 0x00100},
{"support-list", 0x7b1000, 0x00400},
{"user-config", 0x7c0000, 0x10000},
{"default-config", 0x7d0000, 0x10000},
{"log", 0x7e0000, 0x10000},
{"radio", 0x7f0000, 0x10000},
{NULL, 0, 0}
},
.first_sysupgrade_partition = "os-image",
.last_sysupgrade_partition = "support-list",
},
/** Firmware layout for the CPE510 V2 */
{
.id = "CPE510V2",
.vendor = "CPE510(TP-LINK|UN|N300-5):2.0\r\n",
.support_list =
"SupportList:\r\n"
"CPE510(TP-LINK|EU|N300-5|00000000):2.0\r\n"
"CPE510(TP-LINK|EU|N300-5|45550000):2.0\r\n"
"CPE510(TP-LINK|EU|N300-5|55530000):2.0\r\n"
"CPE510(TP-LINK|UN|N300-5|00000000):2.0\r\n"
"CPE510(TP-LINK|UN|N300-5|45550000):2.0\r\n"
"CPE510(TP-LINK|UN|N300-5|55530000):2.0\r\n"
"CPE510(TP-LINK|US|N300-5|00000000):2.0\r\n"
"CPE510(TP-LINK|US|N300-5|45550000):2.0\r\n"
"CPE510(TP-LINK|US|N300-5|55530000):2.0\r\n"
"CPE510(TP-LINK|UN|N300-5):2.0\r\n"
"CPE510(TP-LINK|EU|N300-5):2.0\r\n"