From: Tomasz Maciej Nowak <tmn505@gmail.com>
Date: Mon, 23 Nov 2020 14:17:30 +0000 (+0100)
Subject: mvebu: base-files: move additional files to subtargets
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4a243ae3329c19eaddffea42bed734e4eff852ad;p=openwrt%2Fstaging%2Fblogic.git

mvebu: base-files: move additional files to subtargets

Both of these scripts are only relevant to cortexa9, therefore move them
there.

Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
---

diff --git a/target/linux/mvebu/base-files/etc/hotplug.d/ieee80211/00-wifi-config-migrate b/target/linux/mvebu/base-files/etc/hotplug.d/ieee80211/00-wifi-config-migrate
deleted file mode 100644
index a8173b3117eb..000000000000
--- a/target/linux/mvebu/base-files/etc/hotplug.d/ieee80211/00-wifi-config-migrate
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# The pcie-controller device was renamed to pcie in Linux kernel 4.14
-# commit 28fbb9c539e2 ("ARM: dts: marvell: fix PCI bus dtc warnings").
-# This script migrates the path in the UCI configuration from the old
-# name to the new name and also back, when am upgrade or downgrade is
-# done. It checks if the name exists before changing the configuration.
-# This has to be done before the 10-wifi-detect script from mac80211 is
-# executed because this would add the devices again under the new path
-# name.
-
-. /lib/functions.sh
-
-PATH_CHANGED=0
-
-rename_wifi_path() {
-	local path_old=$(uci get wireless.${1}.path)
-	local path_new=$(echo ${path_old} | sed "${2}")
-
-	if [ -e "/sys/devices/platform/${path_new}" ] && [ ${path_old} != ${path_new} ]
-	then 
-		uci set wireless.${1}.path=${path_new}
-		PATH_CHANGED=1
-	fi
-}
-
-rename_wifi_path_list() {
-	# migration from kernel 4.9 to 4.14
-	rename_wifi_path $1 "s/soc:pcie-controller/soc:pcie/"
-	# migration from kernel 4.14 to 4.9
-	rename_wifi_path $1 "s/soc:pcie/soc:pcie-controller/"
-}
-
-[ "${ACTION}" = "add" ] && {
-	[ ! -e /etc/config/wireless ] && return
-
-	config_load wireless
-	config_foreach rename_wifi_path_list wifi-device
-
-	[ "$PATH_CHANGED" = "1" ] && uci commit wireless
-}
diff --git a/target/linux/mvebu/base-files/sbin/fan_ctrl.sh b/target/linux/mvebu/base-files/sbin/fan_ctrl.sh
deleted file mode 100755
index 42346683177f..000000000000
--- a/target/linux/mvebu/base-files/sbin/fan_ctrl.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-CPU_TEMP=$(cut -c1-2 /sys/class/hwmon/hwmon2/temp1_input)
-DDR_TEMP=$(cut -c1-2 /sys/class/hwmon/hwmon1/temp1_input)
-WIFI_TEMP=$(cut -c1-2 /sys/class/hwmon/hwmon1/temp2_input)
-
-CPU_LOW=85
-CPU_HIGH=95
-DDR_LOW=65
-DDR_HIGH=75
-WIFI_LOW=100
-WIFI_HIGH=115
-
-if [ -d /sys/devices/pwm_fan ];then
-	FAN_CTRL=/sys/devices/pwm_fan/hwmon/hwmon0/pwm1
-elif [ -d /sys/devices/platform/pwm_fan ];then
-	FAN_CTRL=/sys/devices/platform/pwm_fan/hwmon/hwmon0/pwm1
-else
-	exit 0
-fi
-
-if [ "$CPU_TEMP" -ge "$CPU_HIGH" -o "$DDR_TEMP" -ge "$DDR_HIGH" -o "$WIFI_TEMP" -ge "$WIFI_HIGH" ];then
-	echo "255" > $FAN_CTRL
-elif [ "$CPU_TEMP" -ge "$CPU_LOW" -o "$DDR_TEMP" -ge "$DDR_LOW" -o "$WIFI_TEMP" -ge "$WIFI_LOW" ];then
-	echo "100" > $FAN_CTRL
-else
-	echo "0" > $FAN_CTRL
-fi
diff --git a/target/linux/mvebu/cortexa9/base-files/etc/hotplug.d/ieee80211/00-wifi-config-migrate b/target/linux/mvebu/cortexa9/base-files/etc/hotplug.d/ieee80211/00-wifi-config-migrate
new file mode 100644
index 000000000000..a8173b3117eb
--- /dev/null
+++ b/target/linux/mvebu/cortexa9/base-files/etc/hotplug.d/ieee80211/00-wifi-config-migrate
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+# The pcie-controller device was renamed to pcie in Linux kernel 4.14
+# commit 28fbb9c539e2 ("ARM: dts: marvell: fix PCI bus dtc warnings").
+# This script migrates the path in the UCI configuration from the old
+# name to the new name and also back, when am upgrade or downgrade is
+# done. It checks if the name exists before changing the configuration.
+# This has to be done before the 10-wifi-detect script from mac80211 is
+# executed because this would add the devices again under the new path
+# name.
+
+. /lib/functions.sh
+
+PATH_CHANGED=0
+
+rename_wifi_path() {
+	local path_old=$(uci get wireless.${1}.path)
+	local path_new=$(echo ${path_old} | sed "${2}")
+
+	if [ -e "/sys/devices/platform/${path_new}" ] && [ ${path_old} != ${path_new} ]
+	then 
+		uci set wireless.${1}.path=${path_new}
+		PATH_CHANGED=1
+	fi
+}
+
+rename_wifi_path_list() {
+	# migration from kernel 4.9 to 4.14
+	rename_wifi_path $1 "s/soc:pcie-controller/soc:pcie/"
+	# migration from kernel 4.14 to 4.9
+	rename_wifi_path $1 "s/soc:pcie/soc:pcie-controller/"
+}
+
+[ "${ACTION}" = "add" ] && {
+	[ ! -e /etc/config/wireless ] && return
+
+	config_load wireless
+	config_foreach rename_wifi_path_list wifi-device
+
+	[ "$PATH_CHANGED" = "1" ] && uci commit wireless
+}
diff --git a/target/linux/mvebu/cortexa9/base-files/sbin/fan_ctrl.sh b/target/linux/mvebu/cortexa9/base-files/sbin/fan_ctrl.sh
new file mode 100755
index 000000000000..42346683177f
--- /dev/null
+++ b/target/linux/mvebu/cortexa9/base-files/sbin/fan_ctrl.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+CPU_TEMP=$(cut -c1-2 /sys/class/hwmon/hwmon2/temp1_input)
+DDR_TEMP=$(cut -c1-2 /sys/class/hwmon/hwmon1/temp1_input)
+WIFI_TEMP=$(cut -c1-2 /sys/class/hwmon/hwmon1/temp2_input)
+
+CPU_LOW=85
+CPU_HIGH=95
+DDR_LOW=65
+DDR_HIGH=75
+WIFI_LOW=100
+WIFI_HIGH=115
+
+if [ -d /sys/devices/pwm_fan ];then
+	FAN_CTRL=/sys/devices/pwm_fan/hwmon/hwmon0/pwm1
+elif [ -d /sys/devices/platform/pwm_fan ];then
+	FAN_CTRL=/sys/devices/platform/pwm_fan/hwmon/hwmon0/pwm1
+else
+	exit 0
+fi
+
+if [ "$CPU_TEMP" -ge "$CPU_HIGH" -o "$DDR_TEMP" -ge "$DDR_HIGH" -o "$WIFI_TEMP" -ge "$WIFI_HIGH" ];then
+	echo "255" > $FAN_CTRL
+elif [ "$CPU_TEMP" -ge "$CPU_LOW" -o "$DDR_TEMP" -ge "$DDR_LOW" -o "$WIFI_TEMP" -ge "$WIFI_LOW" ];then
+	echo "100" > $FAN_CTRL
+else
+	echo "0" > $FAN_CTRL
+fi