123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411 |
- From: Henryk Heisig <hyniu@o2.pl>
- Date: Fri, 16 Jun 2017 15:26:30 +0200
- Subject: ar71xx: add support for TP-Link Archer C58 v1
- TP-Link Archer C58 v1 is a dual-band AC1350 router, based on Qualcomm
- QCA9561 + QCA9886. It looks like Archer C59 v1 without USB port.
- Specification:
- - 775/650/258 MHz (CPU/DDR/AHB)
- - 64 MB of RAM (DDR2)
- - 8 MB of FLASH (SPI NOR)
- - 3T3R 2.4 GHz
- - 2T2R 5 GHz
- - 5x 10/100 Mbps Ethernet
- - 6x LED, 3x button
- - UART header on PCB, RX, TX at TP4+5 (backside)
- QCA9886 wlan needs pre_cal_data file and enable ieee80211 phy hotplug to
- patch macaddress.
- Flash instruction:
- Use "factory" image directly in vendor GUI.
- Recovery method:
- 1. Set PC to fixed ip address 192.168.0.66/24.
- 2. Download "lede-ar71xx-generic-archer-c58-v1-squashfs-factory.bin" and
- rename it to "tp_recovery.bin".
- 3. Start a tftp server with the file "tp_recovery.bin" in its root
- directory.
- 4. Turn off the router.
- 5. Press and hold Reset button.
- 6. Turn on router with the reset button pressed and wait ~15 seconds.
- 7. Release the reset button and after a short time the firmware should
- be transferred from the tftp server.
- 8. Wait ~30 second to complete recovery.
- Flash instruction under U-Boot, using UART:
- tftp 0x81000000 lede-ar71xx-...-sysupgrade.bin
- erase 0x9f020000 +$filesize
- cp.b $fileaddr 0x9f020000 $filesize
- reset
- This commit is based on GitHub PR#1112
- Signed-off-by: Henryk Heisig <hyniu@o2.pl>
- 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 5c6b47d0249c979934d61078e16759fc22aa41c7..f9483e9a706fbd98ce6a42e968bc0d31e9da5c84 100755
- --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
- +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
- @@ -62,6 +62,7 @@ archer-c25-v1)
- ucidef_set_led_switch "lan3" "LAN3" "$board:green:lan3" "switch0" "0x04"
- ucidef_set_led_switch "lan4" "LAN4" "$board:green:lan4" "switch0" "0x02"
- ;;
- +archer-c58-v1|\
- archer-c59-v1|\
- archer-c60-v1)
- ucidef_set_led_switch "lan" "LAN" "$board:green:lan" "switch0" "0x1E"
- 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 933ed22815ee076c98a83173aad143c010c9a131..57bc912aa5ede22a3fad4af6a1deb00c33f17cf8 100755
- --- a/target/linux/ar71xx/base-files/etc/board.d/02_network
- +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
- @@ -205,6 +205,7 @@ ar71xx_setup_interfaces()
- ucidef_add_switch "switch0" \
- "0@eth1" "2:lan" "3:lan" "4:lan" "5:lan" "6@eth0" "1:wan"
- ;;
- + archer-c58-v1|\
- archer-c59-v1|\
- rb-450g)
- ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
- diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
- index 3aa1f054d4f791545a8b6644f7bd24f64ed546a3..382500b75ee6dc1fe1126fb3121f4ae205c901d4 100644
- --- a/target/linux/ar71xx/base-files/etc/diag.sh
- +++ b/target/linux/ar71xx/base-files/etc/diag.sh
- @@ -52,6 +52,7 @@ get_status_led() {
- ;;
- archer-c25-v1|\
- archer-c7-v4|\
- + archer-c58-v1|\
- archer-c59-v1|\
- archer-c60-v1|\
- mr12|\
- diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
- index 5dd1d69e7e163c938759ce476846e4d985184b7b..538c86e4743109f7665096da32620d7862248aea 100644
- --- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
- +++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
- @@ -134,6 +134,13 @@ case "$FIRMWARE" in
- ;;
- esac
- ;;
- +"ath10k/pre-cal-pci-0000:00:00.0.bin")
- + case $board in
- + archer-c58-v1)
- + ath10kcal_extract "art" 20480 12064
- + ;;
- + esac
- + ;;
- *)
- exit 1
- ;;
- diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ar71xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
- new file mode 100644
- index 0000000000000000000000000000000000000000..7d2eca546d76b771b12026788510f73a293a9a93
- --- /dev/null
- +++ b/target/linux/ar71xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
- @@ -0,0 +1,21 @@
- +#!/bin/ash
- +
- +[ "$ACTION" == "add" ] || exit 0
- +
- +PHYNBR=${DEVPATH##*/phy}
- +
- +[ -n $PHYNBR ] || exit 0
- +
- +. /lib/ar71xx.sh
- +. /lib/functions/system.sh
- +
- +board=$(ar71xx_board_name)
- +
- +case "$board" in
- + archer-c58-v1)
- + echo $(macaddr_add $(mtd_get_mac_binary mac 8) $(($PHYNBR - 1)) ) > /sys${DEVPATH}/macaddress
- + ;;
- + *)
- + ;;
- +esac
- +
- diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
- index d8e23d97e2cc20f8ba7b3b2fc516ce398c43a19b..59ede17653bbb1994ce9fa734c86c877aedf67e4 100755
- --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
- +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
- @@ -472,6 +472,9 @@ ar71xx_board_detect() {
- *"Archer C7 v4")
- name="archer-c7-v4"
- ;;
- + *"Archer C58 v1")
- + name="archer-c58-v1"
- + ;;
- *"Archer C59 v1")
- name="archer-c59-v1"
- ;;
- diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
- index 31b293ca3c07d2f26ff96037fab5a51bbe9e834c..4a586ca523dcd65d0abbbab14e979f6f1bfee34e 100755
- --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
- +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
- @@ -208,6 +208,7 @@ platform_check_image() {
- ap90q|\
- archer-c25-v1|\
- archer-c7-v4|\
- + archer-c58-v1|\
- archer-c59-v1|\
- archer-c60-v1|\
- bullet-m|\
- diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
- index 5b33d48e52309b807dbdf2697524809ad08072ae..396a4fa02adb37c6e5f9f7f1cc40fd1014361654 100644
- --- a/target/linux/ar71xx/config-4.4
- +++ b/target/linux/ar71xx/config-4.4
- @@ -52,6 +52,7 @@ CONFIG_ATH79_MACH_AP152=y
- CONFIG_ATH79_MACH_AP90Q=y
- CONFIG_ATH79_MACH_AP96=y
- CONFIG_ATH79_MACH_ARCHER_C25_V1=y
- +CONFIG_ATH79_MACH_ARCHER_C58_V1=y
- CONFIG_ATH79_MACH_ARCHER_C59_V1=y
- CONFIG_ATH79_MACH_ARCHER_C60_V1=y
- CONFIG_ATH79_MACH_ARCHER_C7=y
- diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
- index 468d9b333e43814cbadec8d85a20ab94e5cd6d01..4c9012acc6b4c40d88ffc8752086cac86b9b9c92 100644
- --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
- +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
- @@ -1244,6 +1244,16 @@ config ATH79_MACH_ARCHER_C25_V1
- select ATH79_DEV_M25P80
- select ATH79_DEV_WMAC
-
- +config ATH79_MACH_ARCHER_C58_V1
- + bool "TP-LINK Archer C58 v1 support"
- + select SOC_QCA956X
- + select ATH79_DEV_AP9X_PCI if PCI
- + select ATH79_DEV_ETH
- + select ATH79_DEV_GPIO_BUTTONS
- + select ATH79_DEV_LEDS_GPIO
- + select ATH79_DEV_M25P80
- + select ATH79_DEV_WMAC
- +
- config ATH79_MACH_ARCHER_C59_V1
- bool "TP-LINK Archer C59 v1 support"
- select SOC_QCA956X
- diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
- index fbe7fcb0aebb6577b96c27088a158eb025f201cb..8408894669dc5f14f05701359073ef233a1b89f0 100644
- --- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile
- +++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile
- @@ -57,6 +57,7 @@ obj-$(CONFIG_ATH79_MACH_AP152) += mach-ap152.o
- obj-$(CONFIG_ATH79_MACH_AP90Q) += mach-ap90q.o
- obj-$(CONFIG_ATH79_MACH_AP96) += mach-ap96.o
- obj-$(CONFIG_ATH79_MACH_ARCHER_C25_V1) += mach-archer-c25-v1.o
- +obj-$(CONFIG_ATH79_MACH_ARCHER_C58_V1) += mach-archer-c59-v1.o
- obj-$(CONFIG_ATH79_MACH_ARCHER_C59_V1) += mach-archer-c59-v1.o
- obj-$(CONFIG_ATH79_MACH_ARCHER_C60_V1) += mach-archer-c60-v1.o
- obj-$(CONFIG_ATH79_MACH_ARCHER_C7) += mach-archer-c7.o
- diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c
- index d55f9b9f75b38159ed7209aa5acd73ff31088b51..f385d4a5a3148b83ee01007145e0eda2c0ef670f 100644
- --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c
- +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c
- @@ -1,7 +1,7 @@
- /*
- - * TP-Link Archer C59 v1 board support
- + * TP-Link Archer C58/C59 v1 board support
- *
- - * Copyright (C) 2016 Henryk Heisig <hyniu@o2.pl>
- + * Copyright (C) 2017 Henryk Heisig <hyniu@o2.pl>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- @@ -65,6 +65,44 @@
- #define ARCHER_C59_V1_WMAC_CALDATA_OFFSET 0x1000
- #define ARCHER_C59_V1_PCI_CALDATA_OFFSET 0x5000
-
- +static struct gpio_led archer_c58_v1_leds_gpio[] __initdata = {
- + {
- + .name = "archer-c58-v1:green:power",
- + .gpio = ARCHER_C59_74HC_GPIO_LED_POWER,
- + .active_low = 1,
- + },
- + {
- + .name = "archer-c58-v1:green:wlan2g",
- + .gpio = ARCHER_C59_74HC_GPIO_LED_WLAN2,
- + .active_low = 1,
- + },
- + {
- + .name = "archer-c58-v1:green:wlan5g",
- + .gpio = ARCHER_C59_74HC_GPIO_LED_WLAN5,
- + .active_low = 1,
- + },
- + {
- + .name = "archer-c58-v1:green:lan",
- + .gpio = ARCHER_C59_74HC_GPIO_LED_LAN,
- + .active_low = 1,
- + },
- + {
- + .name = "archer-c58-v1:green:wan",
- + .gpio = ARCHER_C59_74HC_GPIO_LED_WAN_GREEN,
- + .active_low = 1,
- + },
- + {
- + .name = "archer-c58-v1:amber:wan",
- + .gpio = ARCHER_C59_74HC_GPIO_LED_WAN_AMBER,
- + .active_low = 1,
- + },
- + {
- + .name = "archer-c58-v1:green:wps",
- + .gpio = ARCHER_C59_74HC_GPIO_LED_WPS,
- + .active_low = 1,
- + },
- +};
- +
- static struct gpio_led archer_c59_v1_leds_gpio[] __initdata = {
- {
- .name = "archer-c59-v1:green:power",
- @@ -177,7 +215,7 @@ static struct spi_board_info archer_c59_v1_spi_info[] = {
- },
- };
-
- -static void __init archer_c59_v1_setup(void)
- +static void __init archer_c5x_v1_setup(void)
- {
- u8 *mac = (u8 *) KSEG1ADDR(0x1f010008);
- u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
- @@ -187,9 +225,6 @@ static void __init archer_c59_v1_setup(void)
- ARRAY_SIZE(archer_c59_v1_spi_info));
- platform_device_register(&archer_c59_v1_spi_device);
-
- - ath79_register_leds_gpio(-1, ARRAY_SIZE(archer_c59_v1_leds_gpio),
- - archer_c59_v1_leds_gpio);
- -
- ath79_register_gpio_keys_polled(-1, ARCHER_C59_V1_KEYS_POLL_INTERVAL,
- ARRAY_SIZE(archer_c59_v1_gpio_keys),
- archer_c59_v1_gpio_keys);
- @@ -233,5 +268,22 @@ static void __init archer_c59_v1_setup(void)
- "LED reset");
- }
-
- +static void __init archer_c58_v1_setup(void)
- +{
- + archer_c5x_v1_setup();
- + ath79_register_leds_gpio(-1, ARRAY_SIZE(archer_c58_v1_leds_gpio),
- + archer_c58_v1_leds_gpio);
- +}
- +
- +MIPS_MACHINE(ATH79_MACH_ARCHER_C58_V1, "ARCHER-C58-V1",
- + "TP-LINK Archer C58 v1", archer_c58_v1_setup);
- +
- +static void __init archer_c59_v1_setup(void)
- +{
- + archer_c5x_v1_setup();
- + ath79_register_leds_gpio(-1, ARRAY_SIZE(archer_c59_v1_leds_gpio),
- + archer_c59_v1_leds_gpio);
- +}
- +
- MIPS_MACHINE(ATH79_MACH_ARCHER_C59_V1, "ARCHER-C59-V1",
- "TP-LINK Archer C59 v1", archer_c59_v1_setup);
- diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
- index 9fbf354e44992f4dff43df0fb0ea99c344801d97..72c1e38c74707aba8fbd3aebc36f35becabd4987 100644
- --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
- +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
- @@ -42,6 +42,7 @@ enum ath79_mach_type {
- ATH79_MACH_AP96, /* Atheros AP96 */
- ATH79_MACH_ARCHER_C25_V1, /* TP-LINK Archer C25 V1 board */
- ATH79_MACH_ARCHER_C5, /* TP-LINK Archer C5 board */
- + ATH79_MACH_ARCHER_C58_V1, /* TP-LINK Archer C58 V1 board */
- ATH79_MACH_ARCHER_C59_V1, /* TP-LINK Archer C59 V1 board */
- ATH79_MACH_ARCHER_C60_V1, /* TP-LINK Archer C60 V1 board */
- ATH79_MACH_ARCHER_C7, /* TP-LINK Archer C7 board */
- diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk
- index 9e4aa8ea30aedba8050a77ebdcfc8f0034cc14d1..557bcdab2237a03957313cc3cda471a9fe3a3706 100644
- --- a/target/linux/ar71xx/image/tp-link.mk
- +++ b/target/linux/ar71xx/image/tp-link.mk
- @@ -119,6 +119,21 @@ define Device/archer-c25-v1
- endef
- TARGET_DEVICES += archer-c25-v1
-
- +define Device/archer-c58-v1
- + DEVICE_TITLE := TP-LINK Archer C58 v1
- + DEVICE_PACKAGES := kmod-ath10k
- + BOARDNAME := ARCHER-C58-V1
- + TPLINK_BOARD_NAME := ARCHER-C58-V1
- + DEVICE_PROFILE := ARCHERC58V1
- + IMAGE_SIZE := 7936k
- + KERNEL := kernel-bin | patch-cmdline | lzma | uImageArcher lzma
- + IMAGES := sysupgrade.bin factory.bin
- + IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
- + IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
- + MTDPARTS := spi0.0:64k(u-boot)ro,64k(mac)ro,1344k(kernel),6592k(rootfs),64k(tplink)ro,64k(art)ro,7936k@0x20000(firmware)
- +endef
- +TARGET_DEVICES += archer-c58-v1
- +
- define Device/archer-c59-v1
- DEVICE_TITLE := TP-LINK Archer C59 v1
- DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k
- diff --git a/target/linux/ar71xx/mikrotik/config-default b/target/linux/ar71xx/mikrotik/config-default
- index 3f6884dcf44c83f9867e4e9936caa79c0abc5dc1..23e862762600f0724a37fe1a390d4d09639c472c 100644
- --- a/target/linux/ar71xx/mikrotik/config-default
- +++ b/target/linux/ar71xx/mikrotik/config-default
- @@ -17,6 +17,7 @@
- # CONFIG_ATH79_MACH_AP90Q is not set
- # CONFIG_ATH79_MACH_AP96 is not set
- # CONFIG_ATH79_MACH_ARCHER_C25_V1 is not set
- +# CONFIG_ATH79_MACH_ARCHER_C58_V1 is not set
- # CONFIG_ATH79_MACH_ARCHER_C59_V1 is not set
- # CONFIG_ATH79_MACH_ARCHER_C60_V1 is not set
- # CONFIG_ATH79_MACH_ARCHER_C7 is not set
- diff --git a/target/linux/ar71xx/nand/config-default b/target/linux/ar71xx/nand/config-default
- index a50099aca12aafdcb27f4f2b77ca2a5ce4b4d6f2..c11ccfe29795d013776870cf21fb6ca8d907af1b 100644
- --- a/target/linux/ar71xx/nand/config-default
- +++ b/target/linux/ar71xx/nand/config-default
- @@ -10,6 +10,7 @@
- # CONFIG_ATH79_MACH_AP147 is not set
- # CONFIG_ATH79_MACH_AP96 is not set
- # CONFIG_ATH79_MACH_ARCHER_C25_V1 is not set
- +# CONFIG_ATH79_MACH_ARCHER_C58_V1 is not set
- # CONFIG_ATH79_MACH_ARCHER_C59_V1 is not set
- # CONFIG_ATH79_MACH_ARCHER_C60_V1 is not set
- # CONFIG_ATH79_MACH_ARCHER_C7 is not set
- diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
- index aeebf8e0bbdc3ec53c42d5cc01a3ffe892b46804..67e2c4475bbd468bd20915767a481711ae872a3a 100644
- --- a/tools/firmware-utils/src/tplink-safeloader.c
- +++ b/tools/firmware-utils/src/tplink-safeloader.c
- @@ -376,6 +376,41 @@ static struct device_info boards[] = {
- .last_sysupgrade_partition = "file-system"
- },
-
- + /** Firmware layout for the C58v1 */
- + {
- + .id = "ARCHER-C58-V1",
- + .vendor = "",
- + .support_list =
- + "SupportList:\r\n"
- + "{product_name:Archer C58,product_ver:1.0.0,special_id:00000000}\r\n"
- + "{product_name:Archer C58,product_ver:1.0.0,special_id:45550000}\r\n"
- + "{product_name:Archer C58,product_ver:1.0.0,special_id:55530000}\r\n",
- + .support_trail = '\x00',
- + .soft_ver = "soft_ver:1.0.0\n",
- +
- + .partitions = {
- + {"fs-uboot", 0x00000, 0x10000},
- + {"default-mac", 0x10000, 0x00200},
- + {"pin", 0x10200, 0x00200},
- + {"product-info", 0x10400, 0x00100},
- + {"partition-table", 0x10500, 0x00800},
- + {"soft-version", 0x11300, 0x00200},
- + {"support-list", 0x11500, 0x00100},
- + {"device-id", 0x11600, 0x00100},
- + {"profile", 0x11700, 0x03900},
- + {"default-config", 0x15000, 0x04000},
- + {"user-config", 0x19000, 0x04000},
- + {"os-image", 0x20000, 0x150000},
- + {"file-system", 0x170000, 0x678000},
- + {"certyficate", 0x7e8000, 0x08000},
- + {"radio", 0x7f0000, 0x10000},
- + {NULL, 0, 0}
- + },
- +
- + .first_sysupgrade_partition = "os-image",
- + .last_sysupgrade_partition = "file-system",
- + },
- +
- /** Firmware layout for the C59v1 */
- {
- .id = "ARCHER-C59-V1",
|