projects / openwrt / staging / adrian.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0c9be4f)
ar71xx: improve support for TP-Link CPE510 v2
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>
Tue, 6 Aug 2019 10:20:05 +0000 (12:20 +0200)
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>
Wed, 6 Nov 2019 12:13:27 +0000 (13:13 +0100)
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 <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 c79b796280fa5cd64bac663f9d5e5d9a737c30d6)
[added CPE510V2 entry to tplink-safeloader.c]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
target/linux/ar71xx/base-files/etc/board.d/01_leds patch | blob | history
target/linux/ar71xx/base-files/etc/board.d/02_network patch | blob | history
target/linux/ar71xx/base-files/lib/ar71xx.sh patch | blob | history
target/linux/ar71xx/base-files/lib/upgrade/platform.sh patch | blob | history
target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c patch | blob | history
target/linux/ar71xx/files/arch/mips/ath79/machtypes.h patch | blob | history
target/linux/ar71xx/image/generic-tp-link.mk patch | blob | history
tools/firmware-utils/src/tplink-safeloader.c patch | blob | history

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 8e49cb9fe253081c944499b207c6d9494fae7381..fa8fb7a91ec0d418b67cf3a2a322e4cf2c03c07e 100755 (executable)
--- 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 1fcfa43c4b5aaba2cc5c41652797f711c45b5248..c1873c16537bf42ec76a6e7853356df90331ae30 100755 (executable)
--- 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 3f76c32854440d650c00125f0c0420679491b7ab..044ef4eae5e1cd2f04bacc5b0c18a151f2fe1253 100755 (executable)
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -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"
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 91bffcb8c1fda3a44a9b7bde8a8aa69b66e108b4..7467fb4613e8b4f840120500ac63ad5c7da37006 100755 (executable)
--- 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|\
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c
index 16efbc8802ab96a10aab474721902344664c7f8f..49d9cf9bb52ef5ba2c2eb3d9ddd5063b7c587e65 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c
@@ -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);
 
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
index 9722744a37d04dec6fe233d7f7faceb3947fa893..900b4ec87b1b8a3bf6def552974ce930df750acd 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
+++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
@@ -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 */
diff --git a/target/linux/ar71xx/image/generic-tp-link.mk b/target/linux/ar71xx/image/generic-tp-link.mk
index e448e5123aa193c2bce9b9a3abf47a1899b3f8b0..e9440bd7863f026a118ba2eb5293852ac4f8986f 100644 (file)
--- a/target/linux/ar71xx/image/generic-tp-link.mk
+++ b/target/linux/ar71xx/image/generic-tp-link.mk
@@ -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
diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
index 98b4f1f90025de52008c0caac88350d710af1d38..a53b05c478550e835e5cd7b68ade87ad913ce9c5 100644 (file)
--- a/tools/firmware-utils/src/tplink-safeloader.c
+++ b/tools/firmware-utils/src/tplink-safeloader.c
@@ -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"
Staging tree of Adrian Schmutzler