From 6bc7e9db521b8768f9b07e20fb13daacbd9ee22c Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Wed, 4 May 2022 14:57:06 +0800 Subject: [PATCH] ath79: drop orphan csac detection Signed-off-by: Tianling Shen (cherry picked from commit 0e2fa122b983f83431212cdcbc5657319ef314eb) --- target/linux/ath79/generic/base-files/etc/board.d/01_leds | 4 ---- .../linux/ath79/generic/base-files/etc/board.d/02_network | 8 +------- .../base-files/etc/hotplug.d/firmware/11-ath10k-caldata | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds index ee82a5b3e2..59ac8a113b 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds @@ -460,10 +460,6 @@ wd,mynet-wifi-rangeextender) xiaomi,aiot-ac2350) ucidef_set_led_switch "wan" "WAN" "blue:wan" "switch0" "0x02" ;; -xwrt,csac) - ucidef_set_led_wlan "wlan5g" "WLAN5G" "xwrt:blue:wlan5g" "phy1tpt" - ucidef_set_led_wlan "wlan2g" "WLAN2G" "xwrt:blue:wlan2g" "phy0tpt" - ;; yuncore,a770) ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1" ucidef_set_led_switch "lan" "LAN" "green:lan" "switch0" "0x10" 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 5a85d4f48c..0b706d4113 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 @@ -301,8 +301,7 @@ ath79_setup_interfaces() iodata,wn-ac1600dgr2|\ iodata,wn-ag300dgr|\ pcs,cr5000|\ - wd,mynet-n750|\ - xwrt,csac) + wd,mynet-n750) ucidef_add_switch "switch0" \ "0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan" ;; @@ -724,11 +723,6 @@ ath79_setup_macs() xiaomi,aiot-ac2350) lan_mac=$(mtd_get_mac_binary art 0x1002) ;; - xwrt,csac) - wan_mac=$(mtd_get_mac_binary art 0x0) - lan_mac=$(macaddr_add "$wan_mac" 1) - label_mac=$wan_mac - ;; zyxel,nbg6616) label_mac=$(mtd_get_mac_ascii u-boot-env ethaddr) ;; 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 516c04f0f0..28851630e4 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 @@ -264,7 +264,6 @@ case "$FIRMWARE" in ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \ /lib/firmware/ath10k/QCA9984/hw1.0/board.bin ;; - xwrt,csac|\ yuncore,a782|\ yuncore,xd4200) caldata_extract "art" 0x5000 0x2f20