From 5c40fcd80ee9774b483a1c6babd1025ab0108e61 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Wed, 6 Oct 2021 23:10:50 +0800
Subject: [PATCH] ipq806x: update some script paths

---
 .../ipq806x/base-files/etc/board.d/02_network      | 14 +++++++-------
 .../linux/ipq806x/base-files/etc/init.d/bootcount  |  6 ------
 .../base-files/etc/init.d/{cpufreq => cpu_freq}    |  6 ++++++
 .../ipq806x/base-files/lib/preinit/04_reorder_eth  |  5 -----
 .../lib/preinit/05_set_iface_mac_ipq806x.sh        |  5 +++++
 .../linux/ipq806x/base-files/lib/upgrade/norton.sh |  2 ++
 6 files changed, 20 insertions(+), 18 deletions(-)
 rename target/linux/ipq806x/base-files/etc/init.d/{cpufreq => cpu_freq} (69%)

diff --git a/target/linux/ipq806x/base-files/etc/board.d/02_network b/target/linux/ipq806x/base-files/etc/board.d/02_network
index abca82b1a..e4b48b15b 100644
--- a/target/linux/ipq806x/base-files/etc/board.d/02_network
+++ b/target/linux/ipq806x/base-files/etc/board.d/02_network
@@ -16,13 +16,6 @@ arris,rac2v1a)
 	ucidef_add_switch "switch0" \
 		"1:lan" "2:lan" "3:lan" "4:lan" "6u@eth1" "0u@eth0"
 	;;
-norton,core-518)
-	mac_addr=$(mtd_get_mac_ascii_mmc 0:APPSBLENV ethaddr)
-	ucidef_add_switch "switch0" \
-		"2:lan" "3:lan" "4:lan" "6u@eth1" "5:wan" "0u@eth0"
-		ucidef_set_interface_macaddr "lan" "$(macaddr_add $mac_addr 1)"
-		ucidef_set_interface_macaddr "wan" "$mac_addr"
-	;;
 askey,rt4230w-rev6 |\
 askey,rt4230w-rev9.3 |\
 asrock,g10 |\
@@ -76,6 +69,13 @@ tplink,c2600)
 	ucidef_add_switch "switch0" \
 		"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "6@eth1" "5:wan" "0@eth0"
 	;;
+norton,core-518)
+	hw_mac_addr=$(mtd_get_mac_ascii_mmc 0:APPSBLENV ethaddr)
+	ucidef_add_switch "switch0" \
+		"2:lan" "3:lan" "4:lan" "6@eth1" "5:wan" "0@eth0"
+	ucidef_set_interface_macaddr "wan" "$hw_mac_addr"
+	ucidef_set_interface_macaddr "lan" "$(macaddr_add $hw_mac_addr 1)"
+	;;
 qcom,ipq8064-ap161)
 	ucidef_set_interface_lan "eth1 eth2"
 	ucidef_add_switch "switch0" \
diff --git a/target/linux/ipq806x/base-files/etc/init.d/bootcount b/target/linux/ipq806x/base-files/etc/init.d/bootcount
index eda260159..fcf896a00 100755
--- a/target/linux/ipq806x/base-files/etc/init.d/bootcount
+++ b/target/linux/ipq806x/base-files/etc/init.d/bootcount
@@ -42,10 +42,4 @@ boot() {
 		}
 		;;
 	esac
-	
-	echo 600000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
-	echo 600000 > /sys/devices/system/cpu/cpu1/cpufreq/scaling_min_freq
-	
-	sysctl -w vm.min_free_kbytes=65536
-	sysctl -w net.netfilter.nf_conntrack_max=65535
 }
diff --git a/target/linux/ipq806x/base-files/etc/init.d/cpufreq b/target/linux/ipq806x/base-files/etc/init.d/cpu_freq
similarity index 69%
rename from target/linux/ipq806x/base-files/etc/init.d/cpufreq
rename to target/linux/ipq806x/base-files/etc/init.d/cpu_freq
index 19278902e..90f28e5b3 100755
--- a/target/linux/ipq806x/base-files/etc/init.d/cpufreq
+++ b/target/linux/ipq806x/base-files/etc/init.d/cpu_freq
@@ -14,4 +14,10 @@ boot() {
     echo 10 > /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor
     echo 50 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold
   fi
+
+	echo 600000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
+	echo 600000 > /sys/devices/system/cpu/cpu1/cpufreq/scaling_min_freq
+	
+	sysctl -w vm.min_free_kbytes=65536
+	sysctl -w net.netfilter.nf_conntrack_max=65535
 }
diff --git a/target/linux/ipq806x/base-files/lib/preinit/04_reorder_eth b/target/linux/ipq806x/base-files/lib/preinit/04_reorder_eth
index 38d0606e9..9f5847361 100644
--- a/target/linux/ipq806x/base-files/lib/preinit/04_reorder_eth
+++ b/target/linux/ipq806x/base-files/lib/preinit/04_reorder_eth
@@ -7,11 +7,6 @@ preinit_reorder_eth() {
 		ip link set eth1 name eth0
 		ip link set ethtmp name eth1
 		;;
-	ruijie,rg-mtfi-m520)
-		base_mac=$(mtd_get_mac_ascii PRODUCTINFO ethaddr)
-		ip link set dev eth0 address $(macaddr_add "$base_mac" 1)
-		ip link set dev eth1 address $(macaddr_add "$base_mac" 2)
-		;;
 	esac
 }
 
diff --git a/target/linux/ipq806x/base-files/lib/preinit/05_set_iface_mac_ipq806x.sh b/target/linux/ipq806x/base-files/lib/preinit/05_set_iface_mac_ipq806x.sh
index ca8d0b155..569a19bac 100644
--- a/target/linux/ipq806x/base-files/lib/preinit/05_set_iface_mac_ipq806x.sh
+++ b/target/linux/ipq806x/base-files/lib/preinit/05_set_iface_mac_ipq806x.sh
@@ -8,6 +8,11 @@ preinit_set_mac_address() {
 		ip link set dev eth0 address "${lan_mac}"
 		ip link set dev eth1 address "${wan_mac}"
 		;;
+	ruijie,rg-mtfi-m520)
+		base_mac=$(mtd_get_mac_ascii PRODUCTINFO ethaddr)
+		ip link set dev eth0 address $(macaddr_add "$base_mac" 1)
+		ip link set dev eth1 address $(macaddr_add "$base_mac" 2)
+		;;
 	esac
 }
 
diff --git a/target/linux/ipq806x/base-files/lib/upgrade/norton.sh b/target/linux/ipq806x/base-files/lib/upgrade/norton.sh
index 08901a24b..d89d766cb 100644
--- a/target/linux/ipq806x/base-files/lib/upgrade/norton.sh
+++ b/target/linux/ipq806x/base-files/lib/upgrade/norton.sh
@@ -104,5 +104,7 @@ norton_do_upgrade() {
 
 	norton_do_flash $tar_file $kernel $rootfs
 
+	nand_do_upgrade "$1"
+
 	return 0
 }