From 0c21781af3aaff9be601ff0486acc5fe25aefb1b Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sun, 12 Dec 2021 23:18:06 +0800 Subject: [PATCH] autocore-arm: add mediatek/mt7622 support --- package/emortal/autocore/Makefile | 3 ++- package/emortal/autocore/files/arm/tempinfo | 8 ++++++-- package/emortal/autocore/files/generic/cpuinfo | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package/emortal/autocore/Makefile b/package/emortal/autocore/Makefile index de35530e81..cd79bc2385 100644 --- a/package/emortal/autocore/Makefile +++ b/package/emortal/autocore/Makefile @@ -14,6 +14,7 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_TARGET_bcm53xx include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/target.mk define Package/autocore-arm TITLE:=Arm auto core loadbalance script @@ -50,7 +51,7 @@ endef define Package/autocore-arm/install $(call Package/autocore/install/Default,$(1)) -ifneq (, $(findstring $(BOARD), ipq40xx ipq806x)) +ifneq ($(filter ipq% %mt7622, $(TARGETID)),) $(INSTALL_BIN) ./files/arm/tempinfo $(1)/sbin/ endif endef diff --git a/package/emortal/autocore/files/arm/tempinfo b/package/emortal/autocore/files/arm/tempinfo index 42825dfbaf..a6134ed6cb 100755 --- a/package/emortal/autocore/files/arm/tempinfo +++ b/package/emortal/autocore/files/arm/tempinfo @@ -1,11 +1,15 @@ #!/bin/sh -mt76_path="/sys/kernel/debug/ieee80211/phy0/mt76/temperature" +mt76_path="/sys/class/ieee80211/phy0/hwmon0/temp1_input" if [ -e "${mt76_path}" ]; then mt76_temp=" $(awk -F ': ' '{print $2}' "${mt76_path}")°C" fi -wifi_temp="$(awk '{printf("%.1f°C ", $0 / 1000)}' /sys/class/ieee80211/phy*/device/hwmon/hwmon*/temp1_input | awk '$1=$1')" +if grep -q "mt7622" "/etc/openwrt_release"; then + wifi_temp="$(awk '{printf("%.1f°C ", $0 / 1000)}' /sys/class/ieee80211/phy*/hwmon*/temp1_input | awk '$1=$1')" +else + wifi_temp="$(awk '{printf("%.1f°C ", $0 / 1000)}' /sys/class/ieee80211/phy*/device/hwmon/hwmon*/temp1_input | awk '$1=$1')" +fi if grep -q "ipq40xx" "/etc/openwrt_release"; then echo -n "WiFi:${mt76_temp} ${wifi_temp}" diff --git a/package/emortal/autocore/files/generic/cpuinfo b/package/emortal/autocore/files/generic/cpuinfo index bbc94cedd4..54f5ec9fa0 100755 --- a/package/emortal/autocore/files/generic/cpuinfo +++ b/package/emortal/autocore/files/generic/cpuinfo @@ -37,7 +37,7 @@ fi if [ -z "${cpu_freq}" ] && [ -z "${cpu_temp}" ]; then echo -n "${cpu_arch} x ${cpu_cores}" -elif [ -z "${cpu_temp}" ] || grep -q "ipq" "/etc/openwrt_release"; then +elif [ -z "${cpu_temp}" ] || grep -Eq "ipq|mt7622" "/etc/openwrt_release"; then echo -n "${cpu_arch} x ${cpu_cores} (${cpu_freq})" elif [ -z "${cpu_freq}" ]; then echo -n "${cpu_arch} x ${cpu_cores} (${cpu_temp})"