From fd954e61e52ea9fbba43fd09062065268e6177d5 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Sun, 5 Apr 2020 11:28:04 +0800
Subject: [PATCH] ipq40xx: enable ath10k_thermal by default

---
 package/kernel/mac80211/ath.mk                    |  1 +
 .../bcm27xx/base-files/lib/preinit/82_set_rpi4    | 12 ------------
 .../base-files/lib/preinit/82_set_rpi_info        | 15 +++++++++++++++
 target/linux/ipq40xx/Makefile                     |  2 +-
 4 files changed, 17 insertions(+), 13 deletions(-)
 delete mode 100644 target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi4
 create mode 100644 target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi_info

diff --git a/package/kernel/mac80211/ath.mk b/package/kernel/mac80211/ath.mk
index 788131b751..0c25d23bb2 100644
--- a/package/kernel/mac80211/ath.mk
+++ b/package/kernel/mac80211/ath.mk
@@ -264,6 +264,7 @@ define KernelPackage/ath10k/config
 
        config ATH10K_THERMAL
                bool "Enable thermal sensors and throttling support"
+               default y
                depends on PACKAGE_kmod-ath10k
 
 endef
diff --git a/target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi4 b/target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi4
deleted file mode 100644
index b75f0ca418..0000000000
--- a/target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi4
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set_rpi4() {
-	case "$(board_name)" in
-	raspberrypi,4-model-b)
-		sed -i 's/VHT80/VHT40/g' /lib/wifi/mac80211.sh
-		sed -i 's|pcdata(boardinfo.system or "?")|luci.sys.exec("uname -m") or "?"|g' /usr/lib/lua/luci/view/admin_status/index.htm
-		;;
-	esac
-}
-
-boot_hook_add preinit_main set_rpi4
diff --git a/target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi_info b/target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi_info
new file mode 100644
index 0000000000..ad83d90b4c
--- /dev/null
+++ b/target/linux/bcm27xx/base-files/lib/preinit/82_set_rpi_info
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set_rpi_info() {
+	case "$(board_name)" in
+	raspberrypi,4-model-b)
+		sed -i 's/VHT80/VHT40/g' /lib/wifi/mac80211.sh
+		sed -i 's|pcdata(boardinfo.system or "?")|pcdata(boardinfo.system or "ARMv8 Processor")|g' /usr/lib/lua/luci/view/admin_status/index.htm
+		;;
+	*)
+		sed -i 's|pcdata(boardinfo.system or "?")|pcdata(boardinfo.system or "ARMv8 Processor")|g' /usr/lib/lua/luci/view/admin_status/index.htm
+		;;
+	esac
+}
+
+boot_hook_add preinit_main set_rpi_info
diff --git a/target/linux/ipq40xx/Makefile b/target/linux/ipq40xx/Makefile
index 6179cfb7dc..e1f79554b2 100644
--- a/target/linux/ipq40xx/Makefile
+++ b/target/linux/ipq40xx/Makefile
@@ -20,7 +20,7 @@ DEFAULT_PACKAGES += \
 	kmod-ath10k wpad-openssl \
 	kmod-usb3 kmod-usb-dwc3 ath10k-firmware-qca4019 \
 	automount autosamba luci-app-ipsec-vpnd v2ray shadowsocks-libev-ss-redir shadowsocksr-libev-server \
-	luci-app-unblockmusic luci-app-cpufreq luci-app-zerotier luci-app-xlnetacc ca-certificates \
+	luci-app-unblockmusic luci-app-cpufreq luci-app-zerotier ca-certificates lm-sensors \
 	htop fdisk e2fsprogs
 
 $(eval $(call BuildTarget))