ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-18 16:40:29 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

ath79: move base-files for ZyXEL NBG6716

Browse Source 
Due to rebase of the base-files split patch after adding support
for the ZyXEL NBG6716, its base-files were added to the generic
subtarget, although the device belongs to the nand subtarget.

This moves the definitions to their proper locations.

Fixes: 0130022baec0 ("ath79: split base-files into subtargets")

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
[improve commit message, rebase]
Signed-off-by: David Bauer <mail@david-bauer.net>
This commit is contained in:
Adrian Schmutzler 2019-10-27 14:40:37 +01:00 committed by David Bauer
parent 62db255543
commit b288c56e1e
8 changed files with 53 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/linux/ath79/generic/base-files/etc/board.d/02_network
View File

@ -261,10 +261,6 @@ ath79_setup_interfaces()
ucidef_add_switch "switch0" \
"0@eth0" "3:lan:1" "4:lan:2"
;;
zyxel,nbg6716)
ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "6@eth1"
;;
*)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
;;
@ -399,10 +395,6 @@ ath79_setup_macs()
wd,mynet-wifi-rangeextender)
lan_mac=$(nvram get et0macaddr)
;;
zyxel,nbg6716)
lan_mac=$(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +2)
wan_mac=$(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +3)
;;
esac
[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac

4
target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
View File

@ -47,10 +47,6 @@ case "$FIRMWARE" in
caldata_extract "radiocfg" 0x1000 0x440
ath9k_patch_mac $(mtd_get_mac_ascii devdata "wlan24mac")
;;
zyxel,nbg6716)
caldata_extract "art" 0x1000 0x440
ath9k_patch_mac $(mtd_get_mac_ascii u-boot-env ethaddr)
;;
*)
caldata_die "board $board is not supported yet"
;;

4
target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
View File

@ -113,10 +113,6 @@ case "$FIRMWARE" in
ubnt,unifiac-pro)
caldata_extract "EEPROM" 0x5000 0x844
;;
zyxel,nbg6716)
caldata_extract "art" 0x5000 0x844
ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +1)
;;
esac
;;
"ath10k/pre-cal-pci-0000:00:00.0.bin")

3
target/linux/ath79/generic/base-files/lib/upgrade/platform.sh
View File

@ -51,9 +51,6 @@ platform_do_upgrade() {
ubnt,routerstation-pro)
echo "Sysupgrade disabled due bug FS#2428"
;;
zyxel,nbg6716)
nand_do_upgrade "$1"
;;
*)
default_do_upgrade "$1"
;;

8
target/linux/ath79/nand/base-files/etc/board.d/02_network
View File

@ -11,6 +11,10 @@ ath79_setup_interfaces()
aerohive,hiveap-121)
ucidef_set_interface_lan "eth0"
;;
zyxel,nbg6716)
ucidef_add_switch "switch0" \
"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "6@eth1"
;;
*)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
;;
@ -22,6 +26,10 @@ ath79_setup_macs()
local board="$1"
case "$board" in
zyxel,nbg6716)
lan_mac=$(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +2)
wan_mac=$(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +3)
;;
esac
[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac

21
target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom Normal file
View File

@ -0,0 +1,21 @@
#!/bin/sh
[ -e /lib/firmware/$FIRMWARE ] && exit 0
. /lib/functions/caldata.sh
board=$(board_name)
case "$FIRMWARE" in
"ath9k-eeprom-ahb-18100000.wmac.bin")
case $board in
zyxel,nbg6716)
caldata_extract "art" 0x1000 0x440
ath9k_patch_mac $(mtd_get_mac_ascii u-boot-env ethaddr)
;;
*)
caldata_die "board $board is not supported yet"
;;
esac
;;
esac

22
target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata Normal file
View File

@ -0,0 +1,22 @@
#!/bin/sh
[ -e /lib/firmware/$FIRMWARE ] && exit 0
. /lib/functions/caldata.sh
. /lib/functions/k2t.sh
board=$(board_name)
case "$FIRMWARE" in
"ath10k/cal-pci-0000:00:00.0.bin")
case $board in
zyxel,nbg6716)
caldata_extract "art" 0x5000 0x844
ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +1)
;;
esac
;;
*)
exit 1
;;
esac

3
target/linux/ath79/nand/base-files/lib/upgrade/platform.sh
View File

@ -13,7 +13,8 @@ platform_do_upgrade() {
local board=$(board_name)
case "$board" in
aerohive,hiveap-121)
aerohive,hiveap-121|\
zyxel,nbg6716)
nand_do_upgrade "$1"
;;
*)