From 66de6c50508b6521b5c95179e7b301de18b50a65 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sat, 21 Mar 2020 22:17:09 +0800 Subject: [PATCH 1/3] luci-app-cpufreq: drop untest target (#3915) Someone reports that it has bug in arm64 --- package/lean/luci-app-cpufreq/Makefile | 4 +-- .../luasrc/controller/cpufreq.lua | 3 +-- .../luci-app-cpufreq/root/etc/init.d/cpufreq | 12 ++++----- .../root/etc/uci-defaults/cpufreq | 2 +- .../base-files/etc/init.d/linksys_recovery | 27 +++++++++---------- 5 files changed, 21 insertions(+), 27 deletions(-) diff --git a/package/lean/luci-app-cpufreq/Makefile b/package/lean/luci-app-cpufreq/Makefile index 951a15fb43..ba5eeba8b7 100644 --- a/package/lean/luci-app-cpufreq/Makefile +++ b/package/lean/luci-app-cpufreq/Makefile @@ -7,10 +7,10 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI for CPU Freq Setting -LUCI_DEPENDS:=@(arm||aarch64) +LUCI_DEPENDS:=@arm PKG_NAME:=luci-app-cpufreq PKG_VERSION:=1 -PKG_RELEASE:=3 +PKG_RELEASE:=4 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-cpufreq/luasrc/controller/cpufreq.lua b/package/lean/luci-app-cpufreq/luasrc/controller/cpufreq.lua index 22b570163e..1b13e01a2b 100644 --- a/package/lean/luci-app-cpufreq/luasrc/controller/cpufreq.lua +++ b/package/lean/luci-app-cpufreq/luasrc/controller/cpufreq.lua @@ -5,7 +5,6 @@ function index() if not nixio.fs.access("/etc/config/cpufreq") then return end - + entry({"admin", "services", "cpufreq"}, cbi("cpufreq"), _("CPU Freq"), 900).dependent=false end - diff --git a/package/lean/luci-app-cpufreq/root/etc/init.d/cpufreq b/package/lean/luci-app-cpufreq/root/etc/init.d/cpufreq index df42f3c730..2a47466b9a 100755 --- a/package/lean/luci-app-cpufreq/root/etc/init.d/cpufreq +++ b/package/lean/luci-app-cpufreq/root/etc/init.d/cpufreq @@ -16,14 +16,12 @@ start() local maxfreq=$(uci_get_by_type settings maxfreq 716000) local upthreshold=$(uci_get_by_type settings upthreshold 50) local factor=$(uci_get_by_type settings factor 10) - + echo $governor > /sys/devices/system/cpu/cpufreq/policy0/scaling_governor - echo $minifreq > /sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq - echo $maxfreq > /sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq + echo $minifreq > /sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq + echo $maxfreq > /sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq if [ "$governor" == "ondemand" ]; then - echo $upthreshold > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold - echo $factor > /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor + echo $upthreshold > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold + echo $factor > /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor fi } - - diff --git a/package/lean/luci-app-cpufreq/root/etc/uci-defaults/cpufreq b/package/lean/luci-app-cpufreq/root/etc/uci-defaults/cpufreq index 2f198c445b..8443be5799 100755 --- a/package/lean/luci-app-cpufreq/root/etc/uci-defaults/cpufreq +++ b/package/lean/luci-app-cpufreq/root/etc/uci-defaults/cpufreq @@ -8,4 +8,4 @@ uci -q batch <<-EOF >/dev/null EOF rm -f /tmp/luci-indexcache -exit 0 \ No newline at end of file +exit 0 diff --git a/target/linux/ipq806x/base-files/etc/init.d/linksys_recovery b/target/linux/ipq806x/base-files/etc/init.d/linksys_recovery index 45e73a75d0..44301c49f1 100755 --- a/target/linux/ipq806x/base-files/etc/init.d/linksys_recovery +++ b/target/linux/ipq806x/base-files/etc/init.d/linksys_recovery @@ -3,21 +3,18 @@ START=97 boot() { -. /lib/functions.sh + . /lib/functions.sh -case $(board_name) in - linksys,ea8500) - # make sure auto_recovery in uboot is always on - AUTO_RECOVERY_ENA="`fw_printenv -n auto_recovery`" - if [ "$AUTO_RECOVERY_ENA" != "yes" ] ; then - fw_setenv auto_recovery yes - fi - # reset the boot counter - mtd resetbc s_env - ;; -esac + case $(board_name) in + linksys,ea8500) + # make sure auto_recovery in uboot is always on + AUTO_RECOVERY_ENA="`fw_printenv -n auto_recovery`" + if [ "$AUTO_RECOVERY_ENA" != "yes" ] ; then + fw_setenv auto_recovery yes + fi + # reset the boot counter + mtd resetbc s_env + ;; + esac -echo 35 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold -echo 10 > /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor } - From 1336b90b1a0558719220a2a25763460caa12a6ac Mon Sep 17 00:00:00 2001 From: gudumuyu <32303402+gudumuyu@users.noreply.github.com> Date: Sat, 21 Mar 2020 22:17:40 +0800 Subject: [PATCH 2/3] kcptun bump to v20200321 (#3918) Recompiled with golang1.14.1 --- package/lean/kcptun/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lean/kcptun/Makefile b/package/lean/kcptun/Makefile index d7a912c6f1..a5dd316719 100644 --- a/package/lean/kcptun/Makefile +++ b/package/lean/kcptun/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kcptun -PKG_VERSION:=20200226 +PKG_VERSION:=20200321 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/xtaci/kcptun/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=3d3c342b6073a199f3daa926f1b1d221d50d385fd6905bf00286b0f874439822 +PKG_HASH:=450E586528BD7B2E586605E3A664F77EBD9BAA869918FCC6D6A41F84D4CFB4FD PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE.md @@ -62,4 +62,4 @@ $(foreach component,$(KCPTUN_COMPONENTS), \ $(eval $(call Package/kcptun/Default,$(component))) \ $(eval $(call GoBinPackage,kcptun-$(component))) \ $(eval $(call BuildPackage,kcptun-$(component))) \ -) \ No newline at end of file +) From 86e132e34b2e97373263067ba37f3cde93df6dc0 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sat, 21 Mar 2020 22:19:30 +0800 Subject: [PATCH 3/3] ramips: fix GHL support for MX25L25635E flash (#3906) Co-authored-by: Chen Minqiang --- .../linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi | 0 target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) mode change 100755 => 100644 target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi diff --git a/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi b/target/linux/ramips/dts/mt7620a_netgear_ex2700_wn3000rp-v3.dtsi old mode 100755 new mode 100644 diff --git a/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts b/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts index fea83e5e15..0792675587 100644 --- a/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts +++ b/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts @@ -49,10 +49,9 @@ status = "okay"; flash@0 { - compatible = "mx25l25635f", "jedec,spi-nor"; + compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <25000000>; - m25p,fast-read; partitions { compatible = "fixed-partitions";