aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79/generic/base-files/etc
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2019-10-27 14:40:37 +0100
committerDavid Bauer <mail@david-bauer.net>2019-10-27 18:03:56 +0100
commitb288c56e1e0b4a45579169906845c90b61e5ace4 (patch)
treefc1a85950d44fdc2c79296d7e720bbe64eb49cb7 /target/linux/ath79/generic/base-files/etc
parent62db255543c8fb5d1787caf36c6c7c9c51db71cd (diff)
downloadupstream-b288c56e1e0b4a45579169906845c90b61e5ace4.tar.gz
upstream-b288c56e1e0b4a45579169906845c90b61e5ace4.tar.bz2
upstream-b288c56e1e0b4a45579169906845c90b61e5ace4.zip
ath79: move base-files for ZyXEL NBG6716
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>
Diffstat (limited to 'target/linux/ath79/generic/base-files/etc')
-rwxr-xr-xtarget/linux/ath79/generic/base-files/etc/board.d/02_network8
-rw-r--r--target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom4
-rw-r--r--target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata4
3 files changed, 0 insertions, 16 deletions
diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
index 7507c6584c..90f622b262 100755
--- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
@@ -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
diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
index f1bc6c3c22..4b07660f02 100644
--- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
@@ -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"
;;
diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 91e813f121..b2ec803a72 100644
--- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -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")