From 595abcf8cb2dc794801c6ed5f1641783fccf5806 Mon Sep 17 00:00:00 2001 From: nrbffs <38812627+nrbffs@users.noreply.github.com> Date: Sun, 8 May 2022 12:12:15 +0200 Subject: [PATCH 1/4] ath79: add patch to fix serial console and sysupgrade on OR750 (#2512) The serial console on the Joy-IT OR750i doesn't work, because the UART node is disabled in device tree. This also breaks sysupgrade. The issue is already fixed upstream in OpenWRT by 7054721cf94f4aa8fe71ac4c28c922b19a69ba1d ("ath79: enable UART in SoC DTSI files"), but since 19.07 doesn't support the OR750, we need our own patch. Signed-off-by: Nico Boehr Co-authored-by: Nico Boehr --- .../0026-ath79-Joy-IT-OR750i-fix-UART.patch | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 patches/openwrt/0026-ath79-Joy-IT-OR750i-fix-UART.patch diff --git a/patches/openwrt/0026-ath79-Joy-IT-OR750i-fix-UART.patch b/patches/openwrt/0026-ath79-Joy-IT-OR750i-fix-UART.patch new file mode 100644 index 0000000000..d23097c6c0 --- /dev/null +++ b/patches/openwrt/0026-ath79-Joy-IT-OR750i-fix-UART.patch @@ -0,0 +1,21 @@ +From: Nico Boehr +Date: Sat, 7 May 2022 08:39:05 +0200 +Subject: ath79: Joy-IT OR750i: fix UART + +The serial console defaults to disabled in the DTSI files, explicitly +enable it for the Joy-IT OR750i, so we can get a console in linux. + +Signed-off-by: Nico Boehr + +diff --git a/target/linux/ath79/dts/qca9531_joyit_jt-or750i.dts b/target/linux/ath79/dts/qca9531_joyit_jt-or750i.dts +index 60fa922878355ebdaf7d2983fe926efdf8b97207..042348d82c479c097f534f0bf2bb383ace55e02d 100644 +--- a/target/linux/ath79/dts/qca9531_joyit_jt-or750i.dts ++++ b/target/linux/ath79/dts/qca9531_joyit_jt-or750i.dts +@@ -121,3 +121,7 @@ + + mtd-cal-data = <&art 0x1000>; + }; ++ ++&uart { ++ status = "okay"; ++}; From 5a9ebce31f706f07052bdb9ed5be40ffdc2cee99 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 12 Aug 2022 00:44:48 +0200 Subject: [PATCH 2/4] modules: update OpenWrt (#2608) 83b0e20711 ramips: fix RT-AC57U button level Signed-off-by: David Bauer Signed-off-by: David Bauer --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index c094035275..ff63131af4 100644 --- a/modules +++ b/modules @@ -2,7 +2,7 @@ GLUON_FEEDS='packages routing gluon' OPENWRT_REPO=https://github.com/openwrt/openwrt.git OPENWRT_BRANCH=openwrt-19.07 -OPENWRT_COMMIT=ecbbb373edf7be017e546be2443e6c422cb9c220 +OPENWRT_COMMIT=83b0e20711ee4a927634b3c2a018c93527e84a2b PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-19.07 From 0c17f5fb8b3d37ed85fd6f3f94d9a6fbb8faace4 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 12 Aug 2022 00:45:07 +0200 Subject: [PATCH 3/4] modules: update OpenWrt (#2608) 83b0e20711 ramips: fix RT-AC57U button level Signed-off-by: David Bauer Signed-off-by: David Bauer From 77dfea9cdda9f177e03524bbc76aa8090ceb2018 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 6 Aug 2022 18:52:49 +0200 Subject: [PATCH 4/4] gluon-mesh-vpn-fastd: fix respondd segfault under load When running "fastd -v" fails, line may be NULL, causing a segfault in strncmp. (cherry picked from commit 8dd0f32c187ec62101892080785815ca3bee768b) --- package/gluon-mesh-vpn-fastd/src/respondd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gluon-mesh-vpn-fastd/src/respondd.c b/package/gluon-mesh-vpn-fastd/src/respondd.c index 4d4b5a37b1..4a321d304e 100644 --- a/package/gluon-mesh-vpn-fastd/src/respondd.c +++ b/package/gluon-mesh-vpn-fastd/src/respondd.c @@ -65,7 +65,7 @@ static struct json_object * get_fastd_version(void) { } const char *version = line; - if (strncmp(version, "fastd ", 6) == 0) + if (version && strncmp(version, "fastd ", 6) == 0) version += 6; struct json_object *ret = gluonutil_wrap_string(version);