From b288c56e1e0b4a45579169906845c90b61e5ace4 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 27 Oct 2019 14:40:37 +0100 Subject: 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 [improve commit message, rebase] Signed-off-by: David Bauer --- .../ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom | 4 ---- .../ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata | 4 ---- 2 files changed, 8 deletions(-) (limited to 'target/linux/ath79/generic/base-files/etc/hotplug.d/firmware') 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") -- cgit v1.2.3