ipq40xx: add missing device config for rt-ac1300uhp (#4300)

This commit is contained in:
AmadeusGhost 2020-04-14 09:22:11 +08:00 committed by GitHub
parent f4a9966616
commit f7cdc54602
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 36 additions and 28 deletions

View File

@ -11,7 +11,8 @@ board=$(board_name)
boardname="${board##*,}"
case "$board" in
asus,rt-ac58u)
asus,rt-ac58u |\
asus,rt-ac1300uhp)
ucidef_set_led_wlan "wlan2g" "WLAN2G" "${boardname}:blue:wlan2G" "phy0tpt"
ucidef_set_led_wlan "wlan5g" "WLAN5G" "${boardname}:blue:wlan5G" "phy1tpt"
ucidef_set_led_switch "wan" "WAN" "${boardname}:blue:wan" "switch0" "0x20"

View File

@ -16,12 +16,6 @@ ipq40xx_setup_interfaces()
ucidef_add_switch "switch0" \
"0t@eth0" "4:lan" "5:wan"
;;
p2w,r619ac|\
p2w,r619ac-128m|\
zyxel,nbg6617)
ucidef_add_switch "switch0" \
"0t@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan:5"
;;
asus,map-ac2200|\
openmesh,a42|\
openmesh,a62)
@ -30,6 +24,7 @@ ipq40xx_setup_interfaces()
;;
asus,rt-acrh17|\
asus,rt-ac58u|\
asus,rt-ac1300uhp|\
avm,fritzbox-4040|\
linksys,ea6350v3)
ucidef_add_switch "switch0" \
@ -57,6 +52,12 @@ ipq40xx_setup_interfaces()
ucidef_add_switch "switch0" \
"0t@eth0" "3:lan:2" "4:lan:1" "5:wan"
;;
p2w,r619ac|\
p2w,r619ac-128m|\
zyxel,nbg6617)
ucidef_add_switch "switch0" \
"0t@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan:5"
;;
*)
echo "Unsupported hardware. Network interfaces not initialized"
;;
@ -85,8 +86,8 @@ ipq40xx_setup_macs()
;;
esac
[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" $wan_mac
[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" $wan_mac
}
board_config_update

View File

@ -138,14 +138,22 @@ case "$FIRMWARE" in
asus,map-ac2200)
ath10kcal_ubi_extract "Factory" 4096 12064
;;
asus,rt-acrh17|\
asus,rt-ac58u)
asus,rt-acrh17 |\
asus,rt-ac58u |\
asus,rt-ac1300uhp)
CI_UBIPART=UBI_DEV
ath10kcal_ubi_extract "Factory" 4096 12064
;;
avm,fritzbox-4040)
/usr/bin/fritz_cal_extract -i 1 -s 0x400 -e 0x207 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader_config")
;;
compex,wpj428 |\
engenius,eap1300 |\
hugo,ac1200 |\
openmesh,a42 |\
openmesh,a62)
ath10kcal_extract "0:ART" 4096 12064
;;
meraki,mr33)
ath10kcal_ubi_extract "ART" 4096 12064
ath10kcal_is_caldata_valid "202f" || ath10kcal_extract "ART" 4096 12064
@ -156,13 +164,6 @@ case "$FIRMWARE" in
ath10kcal_extract "ART" 4096 12064
ath10kcal_patch_mac_crc $(mtd_get_mac_binary dnidata 0)
;;
compex,wpj428 |\
engenius,eap1300 |\
hugo,ac1200 |\
openmesh,a42 |\
openmesh,a62)
ath10kcal_extract "0:ART" 4096 12064
;;
zyxel,nbg6617 |\
zyxel,wre6606)
ath10kcal_extract "ART" 4096 12064
@ -184,13 +185,21 @@ case "$FIRMWARE" in
asus,map-ac2200)
ath10kcal_ubi_extract "Factory" 20480 12064
;;
asus,rt-ac58u)
asus,rt-ac58u |\
asus,rt-ac1300uhp)
CI_UBIPART=UBI_DEV
ath10kcal_ubi_extract "Factory" 20480 12064
;;
avm,fritzbox-4040)
/usr/bin/fritz_cal_extract -i 1 -s 0x400 -e 0x208 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader_config")
;;
compex,wpj428 |\
engenius,eap1300 |\
hugo,ac1200 |\
openmesh,a42 |\
openmesh,a62)
ath10kcal_extract "0:ART" 20480 12064
;;
meraki,mr33)
ath10kcal_ubi_extract "ART" 20480 12064
ath10kcal_is_caldata_valid "202f" || ath10kcal_extract "ART" 20480 12064
@ -201,13 +210,6 @@ case "$FIRMWARE" in
ath10kcal_extract "ART" 20480 12064
ath10kcal_patch_mac_crc $(mtd_get_mac_binary dnidata 12)
;;
compex,wpj428 |\
engenius,eap1300 |\
hugo,ac1200 |\
openmesh,a42 |\
openmesh,a62)
ath10kcal_extract "0:ART" 20480 12064
;;
zyxel,nbg6617 |\
zyxel,wre6606)
ath10kcal_extract "ART" 20480 12064

View File

@ -10,7 +10,8 @@ preinit_set_mac_address() {
ip link set dev eth1 address $(macaddr_add "$base_mac" +3)
;;
asus,rt-acrh17|\
asus,rt-ac58u)
asus,rt-ac58u|\
asus,rt-ac1300uhp)
CI_UBIPART=UBI_DEV
mac=$(macaddr_add $(mtd_get_mac_binary_ubi Factory 4102) +1)
ifconfig eth0 hw ether $mac 2>/dev/null
@ -22,6 +23,7 @@ preinit_set_mac_address() {
zyxel,nbg6617)
base_mac=$(cat /sys/class/net/eth0/address)
ip link set dev eth0 address $(macaddr_add "$base_mac" +2)
ip link set dev eth1 address $(macaddr_add "$base_mac" +3)
;;
esac
}

View File

@ -5,6 +5,7 @@ set_preinit_iface() {
case $(board_name) in
asus,rt-ac58u| \
asus,rt-ac1300uhp| \
avm,fritzbox-4040| \
glinet,gl-b1300| \
meraki,mr33| \

View File

@ -172,7 +172,8 @@ platform_do_upgrade() {
nand_do_upgrade "$1"
;;
asus,rt-acrh17|\
asus,rt-ac58u)
asus,rt-ac58u|\
asus,rt-ac1300uhp)
local magic=$(get_magic_long "$1")
CI_UBIPART="UBI_DEV"
CI_KERNPART="linux"