From c5608227ef8b705c18fb5323409bc69bd9ca192e Mon Sep 17 00:00:00 2001 From: John Audia Date: Sat, 26 Feb 2022 08:29:02 -0500 Subject: [PATCH 01/39] tools/coreutils: update to 9.1 In addition to version update, this commit applies a fixup to allow building on MacOS involving renaming: [gt_TYPE_WINT_T] --> [gt_TYPE_WINT_T_GNUTLS] suggested by zhanhb. Build system: x86_64 Build-tested: bcm2711/RPi4B Signed-off-by: John Audia --- tools/coreutils/Makefile | 5 +- tools/coreutils/patches/001-m4.patch | 95 ++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 tools/coreutils/patches/001-m4.patch diff --git a/tools/coreutils/Makefile b/tools/coreutils/Makefile index c64210c5a7..2b7b40cddc 100644 --- a/tools/coreutils/Makefile +++ b/tools/coreutils/Makefile @@ -8,13 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=coreutils PKG_CPE_ID:=cpe:/a:gnu:coreutils -PKG_VERSION:=8.32 +PKG_VERSION:=9.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/coreutils -PKG_HASH:=4458d8de7849df44ccab15e16b1548b285224dbba5f08fac070c1c0e0bcc4cfa +PKG_HASH:=61a1f410d78ba7e7f37a5a4f50e6d1320aca33375484a3255eddf17a38580423 HOST_BUILD_PARALLEL := 1 +PKG_FIXUP:=autoreconf BUILD_PROGRAMS = date readlink touch ln chown ginstall diff --git a/tools/coreutils/patches/001-m4.patch b/tools/coreutils/patches/001-m4.patch new file mode 100644 index 0000000000..f3d7018332 --- /dev/null +++ b/tools/coreutils/patches/001-m4.patch @@ -0,0 +1,95 @@ +--- a/m4/gnulib-comp.m4 ++++ b/m4/gnulib-comp.m4 +@@ -2671,7 +2671,7 @@ changequote([, ])dnl + fi + gl_SYS_SOCKET_MODULE_INDICATOR([socket]) + AC_REQUIRE([gt_TYPE_WCHAR_T]) +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS]) + gl_FUNC_STRERROR_R + AS_IF([test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1], [ + AC_LIBOBJ([strerror_r]) +--- a/m4/stdint.m4 ++++ b/m4/stdint.m4 +@@ -15,7 +15,7 @@ AC_DEFUN_ONCE([gl_STDINT_H], + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + + AC_REQUIRE([gl_LIMITS_H]) +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS]) + + dnl For backward compatibility. Some packages may still be testing these + dnl macros. +--- a/m4/vasnprintf.m4 ++++ b/m4/vasnprintf.m4 +@@ -33,7 +33,7 @@ AC_DEFUN([gl_REPLACE_VASNPRINTF], + AC_DEFUN([gl_PREREQ_PRINTF_ARGS], + [ + AC_REQUIRE([gt_TYPE_WCHAR_T]) +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS]) + ]) + + # Prerequisites of lib/printf-parse.h, lib/printf-parse.c. +@@ -41,7 +41,7 @@ AC_DEFUN([gl_PREREQ_PRINTF_PARSE], + [ + AC_REQUIRE([gl_FEATURES_H]) + AC_REQUIRE([gt_TYPE_WCHAR_T]) +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS]) + AC_REQUIRE([AC_TYPE_SIZE_T]) + AC_CHECK_TYPE([ptrdiff_t], , + [AC_DEFINE([ptrdiff_t], [long], +@@ -55,7 +55,7 @@ AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF], + [ + AC_REQUIRE([AC_FUNC_ALLOCA]) + AC_REQUIRE([gt_TYPE_WCHAR_T]) +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS]) + AC_CHECK_FUNCS([snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb]) + dnl Use the _snprintf function only if it is declared (because on NetBSD it + dnl is defined as a weak alias of snprintf; we prefer to use the latter). +--- a/m4/wchar_h.m4 ++++ b/m4/wchar_h.m4 +@@ -27,7 +27,7 @@ AC_DEFUN_ONCE([gl_WCHAR_H], + + AC_REQUIRE([gl_FEATURES_H]) + +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS]) + if test $gt_cv_c_wint_t = yes; then + HAVE_WINT_T=1 + else +--- a/m4/wctype_h.m4 ++++ b/m4/wctype_h.m4 +@@ -22,7 +22,7 @@ AC_DEFUN_ONCE([gl_WCTYPE_H], + fi + AC_SUBST([HAVE_ISWCNTRL]) + +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS]) + if test $gt_cv_c_wint_t = yes; then + HAVE_WINT_T=1 + else +--- a/m4/wcwidth.m4 ++++ b/m4/wcwidth.m4 +@@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_WCWIDTH], + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + + AC_REQUIRE([gt_TYPE_WCHAR_T]) +- AC_REQUIRE([gt_TYPE_WINT_T]) ++ AC_REQUIRE([gt_TYPE_WINT_T_GNUTLS]) + + AC_CHECK_HEADERS_ONCE([wchar.h]) + AC_CHECK_FUNCS_ONCE([wcwidth]) +--- a/m4/wint_t.m4 ++++ b/m4/wint_t.m4 +@@ -9,7 +9,7 @@ dnl Test whether has the 'wint + dnl or would, if present, override 'wint_t'. + dnl Prerequisite: AC_PROG_CC + +-AC_DEFUN([gt_TYPE_WINT_T], ++AC_DEFUN([gt_TYPE_WINT_T_GNUTLS], + [ + AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t], + [AC_COMPILE_IFELSE( From 57ad2ea110dc3899e87af6c60acf60375c9efa5f Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Sun, 5 Feb 2023 14:06:35 +0100 Subject: [PATCH 02/39] tools/pkgconf: update to 1.9.4 Release information: https://github.com/pkgconf/pkgconf/blob/master/NEWS Fixes CVE-2023-24056. Further, this commit corrects the "-Dtests" flag and changes it from "false" to "disabled". Signed-off-by: Nick Hainke --- tools/pkgconf/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/pkgconf/Makefile b/tools/pkgconf/Makefile index b5f241b7dc..fded7e0fd6 100644 --- a/tools/pkgconf/Makefile +++ b/tools/pkgconf/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pkgconf -PKG_VERSION:=1.9.3 +PKG_VERSION:=1.9.4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://distfiles.dereferenced.org/pkgconf -PKG_HASH:=5fb355b487d54fb6d341e4f18d4e2f7e813a6622cf03a9e87affa6a40565699d +PKG_HASH:=daccf1bbe5a30d149b556c7d2ffffeafd76d7b514e249271abdd501533c1d8ae include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/meson.mk @@ -22,7 +22,7 @@ HOSTCC := $(HOSTCC_NOCACHE) MESON_HOST_ARGS += \ -Ddefault_library=static \ - -Dtests=false + -Dtests=disabled define Host/Install $(call Host/Install/Meson) From 6bc675c0bed969303f94bb59310081d92bf2e74a Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Sun, 5 Feb 2023 14:59:03 +0100 Subject: [PATCH 03/39] tools/pkgconf: add PKG_CPE_ID Add PKG_CPE_ID to track vulnerabilities. Signed-off-by: Nick Hainke --- tools/pkgconf/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/pkgconf/Makefile b/tools/pkgconf/Makefile index fded7e0fd6..c6e11edaf2 100644 --- a/tools/pkgconf/Makefile +++ b/tools/pkgconf/Makefile @@ -13,6 +13,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://distfiles.dereferenced.org/pkgconf PKG_HASH:=daccf1bbe5a30d149b556c7d2ffffeafd76d7b514e249271abdd501533c1d8ae +PKG_CPE_ID:=cpe:/a:pkgconf:pkgconf + include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/meson.mk From cefc543b029a7af72420a5c514245287cd3df933 Mon Sep 17 00:00:00 2001 From: Cezary Jackiewicz Date: Sun, 5 Feb 2023 07:24:05 +0100 Subject: [PATCH 04/39] ipq40xx: fix assignment of lan port numbers for Cell C RTL30VW After switching to DSA, the LAN ports in Cell C RTL30VW have swapped numbers. Assigning the right numbers. Signed-off-by: Cezary Jackiewicz --- .../ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts index 3205b7d564..6fce4ae87b 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-rtl30vw.dts @@ -383,11 +383,11 @@ &swport3 { status = "okay"; - label = "lan2"; + label = "lan1"; }; &swport4 { status = "okay"; - label = "lan1"; + label = "lan2"; }; From f28a604df4659a572dc3b147b65365fef6dc90d9 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Mon, 6 Feb 2023 21:33:26 +0100 Subject: [PATCH 05/39] iwinfo: bump to latest git HEAD c7eb8eb nl80211: restore iterating over all devices in nl80211_phy2ifname() Fixes: #11902 Signed-off-by: Christian Marangi --- package/network/utils/iwinfo/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile index bf258ef455..4f597ca0b8 100644 --- a/package/network/utils/iwinfo/Makefile +++ b/package/network/utils/iwinfo/Makefile @@ -11,9 +11,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/iwinfo.git -PKG_SOURCE_DATE:=2023-01-23 -PKG_SOURCE_VERSION:=1e4e709d6f26cc38411ca189bab04f857b444ef3 -PKG_MIRROR_HASH:=851ca5c724f01260770ac7f4c98bc4f32b03fde635d06c797896ff2c4658c753 +PKG_SOURCE_DATE:=2023-02-06 +PKG_SOURCE_VERSION:=c7eb8ebe33de2ff2d08064258edb047e5ac09f29 +PKG_MIRROR_HASH:=f1124cf305710b0f04e2ea6dd42ba96ba4a3367da4d4afb4c19d5af9905b1cc2 PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0 From bd9844a6fdf48529b05bc843c29fdba3cb748d5e Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Thu, 2 Feb 2023 10:34:52 +0100 Subject: [PATCH 06/39] ipq807x: refresh kernel config Refresh the ipq807x kernel config to keep it up to date and in sync with the generic one. Signed-off-by: Robert Marko --- target/linux/ipq807x/config-5.15 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/linux/ipq807x/config-5.15 b/target/linux/ipq807x/config-5.15 index 5dbc62dd66..9fb604ace2 100644 --- a/target/linux/ipq807x/config-5.15 +++ b/target/linux/ipq807x/config-5.15 @@ -55,6 +55,7 @@ CONFIG_BLK_MQ_PCI=y CONFIG_BLK_MQ_VIRTIO=y CONFIG_BLK_PM=y CONFIG_CAVIUM_TX2_ERRATUM_219=y +CONFIG_CC_HAVE_SHADOW_CALL_STACK=y CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y CONFIG_CLONE_BACKWARDS=y CONFIG_COMMON_CLK=y @@ -257,8 +258,8 @@ CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y CONFIG_NVMEM=y CONFIG_NVMEM_QCOM_QFPROM=y # CONFIG_NVMEM_SPMI_SDAM is not set -CONFIG_NVMEM_U_BOOT_ENV=y CONFIG_NVMEM_SYSFS=y +CONFIG_NVMEM_U_BOOT_ENV=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y @@ -268,6 +269,7 @@ CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_PADATA=y +# CONFIG_PAGE_POOL is not set CONFIG_PARTITION_PERCPU=y CONFIG_PCI=y CONFIG_PCIEAER=y From 047fb7c76d1827e22bef96031192159e738208fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Matijevi=C4=87?= Date: Sun, 5 Feb 2023 09:34:41 +0100 Subject: [PATCH 07/39] ipq806x: add missing enclosing reserved-memory block on C2600/AD7200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Most of the time when booting kernel prints a warning from mm/page_alloc.c when pstore/ramoops is being initialized and ramoops is not functional. Fix this by moving ramopps node into reserved-memory block as described in kernel documentation. Fixes: 2964e5024c ("ipq806x: kernel ramoops storage for C2600/AD7200") Signed-off-by: Filip Matijević --- .../boot/dts/qcom-ipq8064-ad7200-c2600.dtsi | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-ad7200-c2600.dtsi b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-ad7200-c2600.dtsi index 576393015a..7b352edb9b 100644 --- a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-ad7200-c2600.dtsi +++ b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-ad7200-c2600.dtsi @@ -10,14 +10,16 @@ device_type = "memory"; }; - ramoops@42100000 { - compatible = "ramoops"; - reg = <0x42100000 0x40000>; - record-size = <0x4000>; - console-size = <0x4000>; - ftrace-size = <0x4000>; - pmsg-size = <0x4000>; - }; + reserved-memory { + ramoops@42100000 { + compatible = "ramoops"; + reg = <0x42100000 0x40000>; + record-size = <0x4000>; + console-size = <0x4000>; + ftrace-size = <0x4000>; + pmsg-size = <0x4000>; + }; + }; aliases { mdio-gpio0 = &mdio0; From 4970dd027bced78f8a72aa2baed22c962d3b587b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Tue, 7 Feb 2023 18:09:40 +0100 Subject: [PATCH 08/39] bcm47xx: revert bgmac back to the old limited max frame size MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumping max frame size has significantly affected network performance and memory usage. It was done by upstream commit that first appeared in the 5.7 release. Allocating 512 (BGMAC_RX_RING_SLOTS) buffers, 10 k each, is clearly a bad idea on 32 MiB devices. This commit fixes support for Linksys E1000 V2.1 which gives up after allocating ~346 such buffers running 5.15 kernel. Ref: 230c9da963aa ("bcm53xx: revert bgmac back to the old limited max frame size") Signed-off-by: Rafał Miłecki --- ...t-to-PHY-even-if-it-is-BGMAC_PHY_NOR.patch | 33 +++++++++++++++++++ ...t-to-PHY-even-if-it-is-BGMAC_PHY_NOR.patch | 33 +++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 target/linux/bcm47xx/patches-5.10/701-net-bgmac-connect-to-PHY-even-if-it-is-BGMAC_PHY_NOR.patch create mode 100644 target/linux/bcm47xx/patches-5.15/701-net-bgmac-connect-to-PHY-even-if-it-is-BGMAC_PHY_NOR.patch diff --git a/target/linux/bcm47xx/patches-5.10/701-net-bgmac-connect-to-PHY-even-if-it-is-BGMAC_PHY_NOR.patch b/target/linux/bcm47xx/patches-5.10/701-net-bgmac-connect-to-PHY-even-if-it-is-BGMAC_PHY_NOR.patch new file mode 100644 index 0000000000..2c2eb07b82 --- /dev/null +++ b/target/linux/bcm47xx/patches-5.10/701-net-bgmac-connect-to-PHY-even-if-it-is-BGMAC_PHY_NOR.patch @@ -0,0 +1,33 @@ +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Fri, 10 Jun 2022 13:10:47 +0200 +Subject: [PATCH] bgmac: reduce max frame size to support just MTU 1500 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +bgmac allocates new replacement buffer before handling each received +frame. Allocating & DMA-preparing 9724 B each time consumes a lot of CPU +time. Ideally bgmac should just respect currently set MTU but it isn't +the case right now. For now just revert back to the old limited frame +size. + +This change bumps NAT masquarade speed by ~95%. + +Ref: 8c7da63978f1 ("bgmac: configure MTU and add support for frames beyond 8192 byte size") +Signed-off-by: Rafał Miłecki +--- + drivers/net/ethernet/broadcom/bgmac.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/drivers/net/ethernet/broadcom/bgmac.h ++++ b/drivers/net/ethernet/broadcom/bgmac.h +@@ -366,8 +366,7 @@ + #define BGMAC_RX_FRAME_OFFSET 30 /* There are 2 unused bytes between header and real data */ + #define BGMAC_RX_BUF_OFFSET (NET_SKB_PAD + NET_IP_ALIGN - \ + BGMAC_RX_FRAME_OFFSET) +-/* Jumbo frame size with FCS */ +-#define BGMAC_RX_MAX_FRAME_SIZE 9724 ++#define BGMAC_RX_MAX_FRAME_SIZE 1536 + #define BGMAC_RX_BUF_SIZE (BGMAC_RX_FRAME_OFFSET + BGMAC_RX_MAX_FRAME_SIZE) + #define BGMAC_RX_ALLOC_SIZE (SKB_DATA_ALIGN(BGMAC_RX_BUF_SIZE + BGMAC_RX_BUF_OFFSET) + \ + SKB_DATA_ALIGN(sizeof(struct skb_shared_info))) diff --git a/target/linux/bcm47xx/patches-5.15/701-net-bgmac-connect-to-PHY-even-if-it-is-BGMAC_PHY_NOR.patch b/target/linux/bcm47xx/patches-5.15/701-net-bgmac-connect-to-PHY-even-if-it-is-BGMAC_PHY_NOR.patch new file mode 100644 index 0000000000..3a2f4b06ed --- /dev/null +++ b/target/linux/bcm47xx/patches-5.15/701-net-bgmac-connect-to-PHY-even-if-it-is-BGMAC_PHY_NOR.patch @@ -0,0 +1,33 @@ +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Fri, 10 Jun 2022 13:10:47 +0200 +Subject: [PATCH] bgmac: reduce max frame size to support just MTU 1500 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +bgmac allocates new replacement buffer before handling each received +frame. Allocating & DMA-preparing 9724 B each time consumes a lot of CPU +time. Ideally bgmac should just respect currently set MTU but it isn't +the case right now. For now just revert back to the old limited frame +size. + +This change bumps NAT masquarade speed by ~95%. + +Ref: 8c7da63978f1 ("bgmac: configure MTU and add support for frames beyond 8192 byte size") +Signed-off-by: Rafał Miłecki +--- + drivers/net/ethernet/broadcom/bgmac.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/drivers/net/ethernet/broadcom/bgmac.h ++++ b/drivers/net/ethernet/broadcom/bgmac.h +@@ -328,8 +328,7 @@ + #define BGMAC_RX_FRAME_OFFSET 30 /* There are 2 unused bytes between header and real data */ + #define BGMAC_RX_BUF_OFFSET (NET_SKB_PAD + NET_IP_ALIGN - \ + BGMAC_RX_FRAME_OFFSET) +-/* Jumbo frame size with FCS */ +-#define BGMAC_RX_MAX_FRAME_SIZE 9724 ++#define BGMAC_RX_MAX_FRAME_SIZE 1536 + #define BGMAC_RX_BUF_SIZE (BGMAC_RX_FRAME_OFFSET + BGMAC_RX_MAX_FRAME_SIZE) + #define BGMAC_RX_ALLOC_SIZE (SKB_DATA_ALIGN(BGMAC_RX_BUF_SIZE + BGMAC_RX_BUF_OFFSET) + \ + SKB_DATA_ALIGN(sizeof(struct skb_shared_info))) From 00a20335ba2bac4cc33048464ba4bab070309db7 Mon Sep 17 00:00:00 2001 From: "Leon M. George" Date: Thu, 5 May 2022 23:19:53 +0200 Subject: [PATCH 09/39] base-files: ipcalc.sh: check for params before calculating start/end With this patch, ipcalc only calculates range boundaries if the corresponding parameters are supplied. Signed-off-by: Leon M. George --- package/base-files/files/bin/ipcalc.sh | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/package/base-files/files/bin/ipcalc.sh b/package/base-files/files/bin/ipcalc.sh index 5d5eac3ea8..9b2c4d2afc 100755 --- a/package/base-files/files/bin/ipcalc.sh +++ b/package/base-files/files/bin/ipcalc.sh @@ -46,14 +46,6 @@ BEGIN { network=and(ipaddr,netmask) broadcast=or(network,compl32(netmask)) - start=or(network,and(ip2int(ARGV[3]),compl32(netmask))) - limit=network+1 - if (startlimit) end=limit - print "IP="int2ip(ipaddr) print "NETMASK="int2ip(netmask) print "BROADCAST="int2ip(broadcast) @@ -63,9 +55,18 @@ BEGIN { # range calculations: # ipcalc - if (ARGC > 3) { - print "START="int2ip(start) - print "END="int2ip(end) - } + if (ARGC <= 3) + exit(0) + + start=or(network,and(ip2int(ARGV[3]),compl32(netmask))) + limit=network+1 + if (startlimit) end=limit + + print "START="int2ip(start) + print "END="int2ip(end) } EOF From 4fe106afd1870cfeb6a45d40f1dbb69e890f1756 Mon Sep 17 00:00:00 2001 From: "Leon M. George" Date: Thu, 5 May 2022 23:47:47 +0200 Subject: [PATCH 10/39] base-files: ipcalc.sh: don't include own address in range Make sure our own address doesn't lie in the calculated range. Signed-off-by: Leon M. George --- package/base-files/files/bin/ipcalc.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/base-files/files/bin/ipcalc.sh b/package/base-files/files/bin/ipcalc.sh index 9b2c4d2afc..66d37952de 100755 --- a/package/base-files/files/bin/ipcalc.sh +++ b/package/base-files/files/bin/ipcalc.sh @@ -61,10 +61,17 @@ BEGIN { start=or(network,and(ip2int(ARGV[3]),compl32(netmask))) limit=network+1 if (startlimit) end=limit + if (end==ipaddr) end=ipaddr-1 + + if (ipaddr > start && ipaddr < end) { + print "ipaddr inside range" > "/dev/stderr" + exit(1) + } print "START="int2ip(start) print "END="int2ip(end) From a40a96e54b0d047d14d99bb715ee2dd94458acb6 Mon Sep 17 00:00:00 2001 From: "Leon M. George" Date: Fri, 6 May 2022 00:02:52 +0200 Subject: [PATCH 11/39] base-files: ipcalc.sh: fail when network is too small It's possible to move range boundaries in a way that the start address lies behind the end address. Detect this condition and exit with an error message. Signed-off-by: Leon M. George --- package/base-files/files/bin/ipcalc.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/base-files/files/bin/ipcalc.sh b/package/base-files/files/bin/ipcalc.sh index 66d37952de..b21b6e28dc 100755 --- a/package/base-files/files/bin/ipcalc.sh +++ b/package/base-files/files/bin/ipcalc.sh @@ -44,13 +44,14 @@ BEGIN { } network=and(ipaddr,netmask) + prefix=32-bitcount(compl32(netmask)) broadcast=or(network,compl32(netmask)) print "IP="int2ip(ipaddr) print "NETMASK="int2ip(netmask) print "BROADCAST="int2ip(broadcast) print "NETWORK="int2ip(network) - print "PREFIX="32-bitcount(compl32(netmask)) + print "PREFIX="prefix # range calculations: # ipcalc @@ -68,6 +69,11 @@ BEGIN { if (end>limit) end=limit if (end==ipaddr) end=ipaddr-1 + if (start>end) { + print "network ("int2ip(network)"/"prefix") too small" > "/dev/stderr" + exit(1) + } + if (ipaddr > start && ipaddr < end) { print "ipaddr inside range" > "/dev/stderr" exit(1) From 6ce9f42b9819b93717d7425ca4135afec6ea43af Mon Sep 17 00:00:00 2001 From: "Leon M. George" Date: Fri, 6 May 2022 00:03:54 +0200 Subject: [PATCH 12/39] base-files: ipcalc.sh: use shebang to invoke awk There's hardly an shell logic in ipcalc.sh and a $* that would garble parameter positions. Move the awk invokation to the shebang. A rename from "ipcalc.sh" to "ipcalc" is desirable but could prove tricky with packages in other repositories depending on the filename. Signed-off-by: Leon M. George --- package/base-files/files/bin/ipcalc.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/base-files/files/bin/ipcalc.sh b/package/base-files/files/bin/ipcalc.sh index b21b6e28dc..e818e67803 100755 --- a/package/base-files/files/bin/ipcalc.sh +++ b/package/base-files/files/bin/ipcalc.sh @@ -1,6 +1,5 @@ -#!/bin/sh +#!/usr/bin/awk -f -awk -f - $* < Date: Sun, 8 May 2022 23:29:06 +0200 Subject: [PATCH 13/39] dnsmasq: refuse to add empty DHCP range Use ipcalc's return value to react to invalid range specifications. By simply ignoring the range instead of aborting with an error code, dnsmasq should still start when there's an error (best effort). Aborting the config generation or working with invalid range specs leaves dnsmasq crash-looping which is the right thing to do concerning that particular interface but it also hinders DHCP service on other interfaces and DNS on the router itself. Signed-off-by: Leon M. George --- package/network/services/dnsmasq/files/dnsmasq.init | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index d3928c2399..21e330ec28 100755 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -584,21 +584,20 @@ dhcp_add() { limit=$((limit-1)) fi - eval "$(ipcalc.sh "${subnet%%/*}" $netmask $start $limit)" + # make sure the DHCP range is not empty + if [ "$dhcpv4" != "disabled" ] && eval "$(ipcalc.sh "${subnet%%/*}" "$netmask" "$start" "$limit")" ; then + [ "$dynamicdhcp" = "0" ] && END="static" + + xappend "--dhcp-range=$tags$nettag$START,$END,$NETMASK,$leasetime${options:+ $options}" + fi if [ "$dynamicdhcp" = "0" ] ; then - END="static" dhcp6range="::,static" else dhcp6range="::1000,::ffff" fi - if [ "$dhcpv4" != "disabled" ] ; then - xappend "--dhcp-range=$tags$nettag$START,$END,$NETMASK,$leasetime${options:+ $options}" - fi - - if [ $DNSMASQ_DHCP_VER -eq 6 ] && [ "$ra" = "server" ] ; then # Note: dnsmasq cannot just be a DHCPv6 server (all-in-1) # and let some other machine(s) send RA pointing to it. From 2903924b576c19ab64490917ec46cb3bee790ad2 Mon Sep 17 00:00:00 2001 From: "Leon M. George" Date: Fri, 14 Oct 2022 14:08:19 +0200 Subject: [PATCH 14/39] base-files: ipcalc.sh: trim for statement For gawk compatibility. Signed-off-by: Leon M. George --- package/base-files/files/bin/ipcalc.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/base-files/files/bin/ipcalc.sh b/package/base-files/files/bin/ipcalc.sh index e818e67803..99269fff06 100755 --- a/package/base-files/files/bin/ipcalc.sh +++ b/package/base-files/files/bin/ipcalc.sh @@ -10,14 +10,20 @@ function bitcount(c) { } function ip2int(ip) { - for (ret=0,n=split(ip,a,"\."),x=1;x<=n;x++) ret=or(lshift(ret,8),a[x]) + ret=0 + n=split(ip,a,"\.") + for (x=1;x<=n;x++) + ret=or(lshift(ret,8),a[x]) return ret } function int2ip(ip,ret,x) { ret=and(ip,255) ip=rshift(ip,8) - for(;x<3;ret=and(ip,255)"."ret,ip=rshift(ip,8),x++); + for(;x<3;x++) { + ret=and(ip,255)"."ret + ip=rshift(ip,8) + } return ret } From 67d2a7ef9ed7f70a962264167527b383ad637303 Mon Sep 17 00:00:00 2001 From: "Leon M. George" Date: Fri, 14 Oct 2022 14:09:34 +0200 Subject: [PATCH 15/39] base-files: ipcalc.sh: fix awk regex syntax It worked fine before but gawk warns about it. Signed-off-by: Leon M. George --- package/base-files/files/bin/ipcalc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/base-files/files/bin/ipcalc.sh b/package/base-files/files/bin/ipcalc.sh index 99269fff06..56854b4104 100755 --- a/package/base-files/files/bin/ipcalc.sh +++ b/package/base-files/files/bin/ipcalc.sh @@ -11,7 +11,7 @@ function bitcount(c) { function ip2int(ip) { ret=0 - n=split(ip,a,"\.") + n=split(ip,a,"\\.") for (x=1;x<=n;x++) ret=or(lshift(ret,8),a[x]) return ret From acd5aa0bb0e9a042a2090472f03dd6b7b6b3461a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Bo=C5=99ek?= Date: Tue, 19 Apr 2022 13:11:43 +0200 Subject: [PATCH 16/39] mpc85xx: p2020: kernel: refresh configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 'make kernel_oldconfig CONFIG_TARGET=subtarget' applied to current master Signed-off-by: Šimon Bořek --- target/linux/mpc85xx/p2020/config-default | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/target/linux/mpc85xx/p2020/config-default b/target/linux/mpc85xx/p2020/config-default index 1d9ef14276..d3fcce5e93 100644 --- a/target/linux/mpc85xx/p2020/config-default +++ b/target/linux/mpc85xx/p2020/config-default @@ -1,30 +1,40 @@ -CONFIG_ARCH_HAS_TICK_BROADCAST=y CONFIG_CPU_RMAP=y +CONFIG_DEFAULT_UIMAGE=y +CONFIG_FSL_ULI1575=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_IRQ_MIGRATION=y +CONFIG_GENERIC_MSI_IRQ=y +CONFIG_GENERIC_MSI_IRQ_DOMAIN=y CONFIG_GENERIC_TBSYNC=y -CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_LOCK_SPIN_ON_OWNER=y +CONFIG_MDIO_DEVRES=y CONFIG_MPC85xx_RDB=y CONFIG_MTD_CFI=y -CONFIG_MTD_NAND_BCH=y -CONFIG_MTD_NAND_ECC_BCH=y CONFIG_MTD_NAND_FSL_ELBC=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_SPLIT_FIRMWARE=y CONFIG_MTD_SPLIT_FIT_FW=y CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NR_CPUS=2 CONFIG_PADATA=y CONFIG_PCI_MSI=y +CONFIG_PCI_MSI_ARCH_FALLBACKS=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y +CONFIG_PPC_I8259=y CONFIG_PPC_MSI_BITMAP=y -# CONFIG_PPC_QUEUED_SPINLOCKS is not set +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=y CONFIG_RFS_ACCEL=y CONFIG_RPS=y CONFIG_RTC_DRV_DS1307=y CONFIG_RWSEM_SPIN_ON_OWNER=y CONFIG_SMP=y +CONFIG_SWIOTLB=y +CONFIG_TARGET_CPU="8540" +CONFIG_TARGET_CPU_BOOL=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y CONFIG_XPS=y From 628870146df4cc327852b1c5cf351d5bde26b61f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Bo=C5=99ek?= Date: Tue, 19 Apr 2022 13:18:42 +0200 Subject: [PATCH 17/39] mpc85xx: p2020: kernel: enable CONFIG_BLK_DEV_NVME MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Enables use of NVMe storage devices with appropriate adapter in miniPCIe slots (including for boot) in Turris 1.x routers and possibly NXP P2020RDB boards (these are the only currently supported p2020 devices according to docs[^1]). Proper detection, mountability and readability was proved to be working on Turris 1.1, OpenWrt 21.02 with similar configuration. Increases gzip compressed kernel size by approximately 37 KiB (from 3 703 KiB to 3 740 KiB). Should boot from those devices be possible the driver needs to be built in. Inclusion as a module would prevent this functionality. CONFIG_BLK_DEV_NVME=y Includes NVMe driver in the kernel.[^2] CONFIG_NVME_CORE=y Selected by CONFIG_BLK_DEV_NVME.[^3] Not necessarily needed to be enabled explicitly, but included to match the form of similar functionality implementations for mvebu, x86_64 and rockchip_armv8 targets. CONFIG_NVME_MULTIPATH disabled explicitly to prevent using more space than necessary. [^1]: https://openwrt.org/docs/techref/targets/mpc85xx [^2]: https://cateee.net/lkddb/web-lkddb/BLK_DEV_NVME.html [^3]: https://cateee.net/lkddb/web-lkddb/NVME_CORE.html Signed-off-by: Šimon Bořek --- target/linux/mpc85xx/p2020/config-default | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/linux/mpc85xx/p2020/config-default b/target/linux/mpc85xx/p2020/config-default index d3fcce5e93..e293008d8b 100644 --- a/target/linux/mpc85xx/p2020/config-default +++ b/target/linux/mpc85xx/p2020/config-default @@ -1,3 +1,4 @@ +CONFIG_BLK_DEV_NVME=y CONFIG_CPU_RMAP=y CONFIG_DEFAULT_UIMAGE=y CONFIG_FSL_ULI1575=y @@ -19,6 +20,8 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NR_CPUS=2 +CONFIG_NVME_CORE=y +# CONFIG_NVME_MULTIPATH is not set CONFIG_PADATA=y CONFIG_PCI_MSI=y CONFIG_PCI_MSI_ARCH_FALLBACKS=y From 38350650cbc43c0386977c9ca532b71ece15c80b Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Sun, 5 Feb 2023 21:14:19 +0100 Subject: [PATCH 18/39] tools/e2fsprogs: update to 1.46.6 Release information: https://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.46.6 Remove upstreamed patch: - 004-CVE-2022-1304-libext2fs-add-sanity-check-to-extent-manipulation.patch Refresh patch: - 003-no-crond.patch Signed-off-by: Nick Hainke --- tools/e2fsprogs/Makefile | 6 +-- tools/e2fsprogs/patches/003-no-crond.patch | 8 +-- ...-sanity-check-to-extent-manipulation.patch | 50 ------------------- 3 files changed, 7 insertions(+), 57 deletions(-) delete mode 100644 tools/e2fsprogs/patches/004-CVE-2022-1304-libext2fs-add-sanity-check-to-extent-manipulation.patch diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile index a8bd745afb..1c72611df7 100644 --- a/tools/e2fsprogs/Makefile +++ b/tools/e2fsprogs/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=e2fsprogs PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs -PKG_VERSION:=1.46.5 -PKG_HASH:=2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e -PKG_RELEASE:=2 +PKG_VERSION:=1.46.6 +PKG_HASH:=a77517f19ff5e4e97ede63536566865dd5d48654e13fc145f5f2249ef7c4f4fc +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/ diff --git a/tools/e2fsprogs/patches/003-no-crond.patch b/tools/e2fsprogs/patches/003-no-crond.patch index a7ea52b1ac..67ddd4ab0c 100644 --- a/tools/e2fsprogs/patches/003-no-crond.patch +++ b/tools/e2fsprogs/patches/003-no-crond.patch @@ -1,11 +1,11 @@ --- a/configure +++ b/configure -@@ -12538,7 +12538,7 @@ $as_echo_n "checking for system crontab +@@ -15259,7 +15259,7 @@ then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${crond_dir}" >&5 - $as_echo "${crond_dir}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${crond_dir}" >&5 + printf "%s\n" "${crond_dir}" >&6; } - have_crond="yes" + have_crond="no"; with_crond_dir="" - else + else $as_nop diff --git a/tools/e2fsprogs/patches/004-CVE-2022-1304-libext2fs-add-sanity-check-to-extent-manipulation.patch b/tools/e2fsprogs/patches/004-CVE-2022-1304-libext2fs-add-sanity-check-to-extent-manipulation.patch deleted file mode 100644 index e5a76161f2..0000000000 --- a/tools/e2fsprogs/patches/004-CVE-2022-1304-libext2fs-add-sanity-check-to-extent-manipulation.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ab51d587bb9b229b1fade1afd02e1574c1ba5c76 Mon Sep 17 00:00:00 2001 -From: Lukas Czerner -Date: Thu, 21 Apr 2022 19:31:48 +0200 -Subject: libext2fs: add sanity check to extent manipulation - -It is possible to have a corrupted extent tree in such a way that a leaf -node contains zero extents in it. Currently if that happens and we try -to traverse the tree we can end up accessing wrong data, or possibly -even uninitialized memory. Make sure we don't do that. - -Additionally make sure that we have a sane number of bytes passed to -memmove() in ext2fs_extent_delete(). - -Note that e2fsck is currently unable to spot and fix such corruption in -pass1. - -Signed-off-by: Lukas Czerner -Reported-by: Nils Bars -Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2068113 -Addresses: CVE-2022-1304 -Addresses-Debian-Bug: #1010263 -Signed-off-by: Theodore Ts'o ---- - lib/ext2fs/extent.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/lib/ext2fs/extent.c -+++ b/lib/ext2fs/extent.c -@@ -495,6 +495,10 @@ retry: - ext2fs_le16_to_cpu(eh->eh_entries); - newpath->max_entries = ext2fs_le16_to_cpu(eh->eh_max); - -+ /* Make sure there is at least one extent present */ -+ if (newpath->left <= 0) -+ return EXT2_ET_EXTENT_NO_DOWN; -+ - if (path->left > 0) { - ix++; - newpath->end_blk = ext2fs_le32_to_cpu(ix->ei_block); -@@ -1630,6 +1634,10 @@ errcode_t ext2fs_extent_delete(ext2_exte - - cp = path->curr; - -+ /* Sanity check before memmove() */ -+ if (path->left < 0) -+ return EXT2_ET_EXTENT_LEAF_BAD; -+ - if (path->left) { - memmove(cp, cp + sizeof(struct ext3_extent_idx), - path->left * sizeof(struct ext3_extent_idx)); From b6bc924b198a7a3b7f558430eec4f7f49bac4ea1 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Sun, 5 Feb 2023 21:28:40 +0100 Subject: [PATCH 19/39] e2fsprogs: update to 1.46.6 Release information: https://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.46.6 Remove upstreamed patch: - 004-CVE-2022-1304-libext2fs-add-sanity-check-to-extent-manipulation.patch Signed-off-by: Nick Hainke --- package/utils/e2fsprogs/Makefile | 6 +-- ...-sanity-check-to-extent-manipulation.patch | 50 ------------------- 2 files changed, 3 insertions(+), 53 deletions(-) delete mode 100644 package/utils/e2fsprogs/patches/004-CVE-2022-1304-libext2fs-add-sanity-check-to-extent-manipulation.patch diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile index 94f22a53cc..82817d95ce 100644 --- a/package/utils/e2fsprogs/Makefile +++ b/package/utils/e2fsprogs/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=e2fsprogs -PKG_VERSION:=1.46.5 -PKG_RELEASE:=2 +PKG_VERSION:=1.46.6 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/ -PKG_HASH:=2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e +PKG_HASH:=a77517f19ff5e4e97ede63536566865dd5d48654e13fc145f5f2249ef7c4f4fc PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=NOTICE diff --git a/package/utils/e2fsprogs/patches/004-CVE-2022-1304-libext2fs-add-sanity-check-to-extent-manipulation.patch b/package/utils/e2fsprogs/patches/004-CVE-2022-1304-libext2fs-add-sanity-check-to-extent-manipulation.patch deleted file mode 100644 index e5a76161f2..0000000000 --- a/package/utils/e2fsprogs/patches/004-CVE-2022-1304-libext2fs-add-sanity-check-to-extent-manipulation.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ab51d587bb9b229b1fade1afd02e1574c1ba5c76 Mon Sep 17 00:00:00 2001 -From: Lukas Czerner -Date: Thu, 21 Apr 2022 19:31:48 +0200 -Subject: libext2fs: add sanity check to extent manipulation - -It is possible to have a corrupted extent tree in such a way that a leaf -node contains zero extents in it. Currently if that happens and we try -to traverse the tree we can end up accessing wrong data, or possibly -even uninitialized memory. Make sure we don't do that. - -Additionally make sure that we have a sane number of bytes passed to -memmove() in ext2fs_extent_delete(). - -Note that e2fsck is currently unable to spot and fix such corruption in -pass1. - -Signed-off-by: Lukas Czerner -Reported-by: Nils Bars -Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2068113 -Addresses: CVE-2022-1304 -Addresses-Debian-Bug: #1010263 -Signed-off-by: Theodore Ts'o ---- - lib/ext2fs/extent.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/lib/ext2fs/extent.c -+++ b/lib/ext2fs/extent.c -@@ -495,6 +495,10 @@ retry: - ext2fs_le16_to_cpu(eh->eh_entries); - newpath->max_entries = ext2fs_le16_to_cpu(eh->eh_max); - -+ /* Make sure there is at least one extent present */ -+ if (newpath->left <= 0) -+ return EXT2_ET_EXTENT_NO_DOWN; -+ - if (path->left > 0) { - ix++; - newpath->end_blk = ext2fs_le32_to_cpu(ix->ei_block); -@@ -1630,6 +1634,10 @@ errcode_t ext2fs_extent_delete(ext2_exte - - cp = path->curr; - -+ /* Sanity check before memmove() */ -+ if (path->left < 0) -+ return EXT2_ET_EXTENT_LEAF_BAD; -+ - if (path->left) { - memmove(cp, cp + sizeof(struct ext3_extent_idx), - path->left * sizeof(struct ext3_extent_idx)); From d53ec2943a7a0615a0beb89d8392ffb30569538b Mon Sep 17 00:00:00 2001 From: Felix Baumann Date: Sun, 29 Jan 2023 20:25:52 +0100 Subject: [PATCH 20/39] lantiq: ar9/vr9: add fritz-tffs package Add fritz-tffs package to AVM devices Reorder some devices packages for consistency Signed-off-by: Felix Baumann --- target/linux/lantiq/image/ar9.mk | 4 ++-- target/linux/lantiq/image/vr9.mk | 16 ++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/target/linux/lantiq/image/ar9.mk b/target/linux/lantiq/image/ar9.mk index 25e4b1fe65..4d9a008f6f 100644 --- a/target/linux/lantiq/image/ar9.mk +++ b/target/linux/lantiq/image/ar9.mk @@ -8,7 +8,7 @@ define Device/avm_fritz7312 kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ ltq-adsl-app ppp-mod-pppoa \ - kmod-ltq-deu-ar9 -swconfig + kmod-ltq-deu-ar9 fritz-tffs -swconfig endef TARGET_DEVICES += avm_fritz7312 @@ -24,7 +24,7 @@ define Device/avm_fritz7320 kmod-ltq-adsl-ar9-mei kmod-ltq-adsl-ar9 \ kmod-ltq-adsl-ar9-fw-b kmod-ltq-atm-ar9 \ ltq-adsl-app ppp-mod-pppoa \ - kmod-ltq-deu-ar9 kmod-usb-dwc2 -swconfig + kmod-ltq-deu-ar9 kmod-usb-dwc2 fritz-tffs -swconfig SUPPORTED_DEVICES += FRITZ7320 endef TARGET_DEVICES += avm_fritz7320 diff --git a/target/linux/lantiq/image/vr9.mk b/target/linux/lantiq/image/vr9.mk index 804088032f..f3149bf2c0 100644 --- a/target/linux/lantiq/image/vr9.mk +++ b/target/linux/lantiq/image/vr9.mk @@ -152,7 +152,8 @@ define Device/avm_fritz7360sl $(Device/AVM) DEVICE_MODEL := FRITZ!Box 7360 SL IMAGE_SIZE := 15744k - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-mbedtls kmod-usb-dwc2 + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-mbedtls \ + kmod-usb-dwc2 fritz-tffs SUPPORTED_DEVICES += FRITZ7360SL endef TARGET_DEVICES += avm_fritz7360sl @@ -163,7 +164,8 @@ define Device/avm_fritz7360-v2 DEVICE_MODEL := FRITZ!Box 7360 DEVICE_VARIANT := v2 IMAGE_SIZE := 32128k - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-mbedtls kmod-usb-dwc2 + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-mbedtls \ + kmod-usb-dwc2 fritz-tffs endef TARGET_DEVICES += avm_fritz7360-v2 @@ -174,7 +176,8 @@ define Device/avm_fritz7362sl DEVICE_MODEL := FRITZ!Box 7362 SL KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-mbedtls kmod-usb-dwc2 fritz-tffs + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-mbedtls \ + kmod-usb-dwc2 fritz-tffs endef TARGET_DEVICES += avm_fritz7362sl @@ -186,7 +189,8 @@ define Device/avm_fritz7412 BOARD_NAME := FRITZ7412 KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-mbedtls fritz-tffs-nand fritz-caldata + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-mbedtls \ + fritz-tffs-nand fritz-caldata endef TARGET_DEVICES += avm_fritz7412 @@ -197,8 +201,8 @@ define Device/avm_fritz7430 DEVICE_MODEL := FRITZ!Box 7430 KERNEL_SIZE := 4096k IMAGE_SIZE := 49152k - DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader kmod-usb-dwc2 wpad-basic-mbedtls \ - fritz-tffs-nand fritz-caldata + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic-mbedtls \ + kmod-usb-dwc2 fritz-tffs-nand fritz-caldata endef TARGET_DEVICES += avm_fritz7430 From 64cf31f6ff5b35bc1bc6e4c87779a3a6c60b7103 Mon Sep 17 00:00:00 2001 From: John Audia Date: Mon, 6 Feb 2023 06:40:12 -0500 Subject: [PATCH 21/39] kernel: bump 5.15 to 5.15.92 All other patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod Run-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod Signed-off-by: John Audia --- include/kernel-5.15 | 4 ++-- ...skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch | 2 +- .../700-net-ethernet-mediatek-support-net-labels.patch | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/kernel-5.15 b/include/kernel-5.15 index 1d1c654c2c..b691f102a4 100644 --- a/include/kernel-5.15 +++ b/include/kernel-5.15 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.15 = .91 -LINUX_KERNEL_HASH-5.15.91 = a63c2bb1beb15f1aea9c63cf80559f5b7ab58afd2da2fa5e7670c515ebe1fe80 +LINUX_VERSION-5.15 = .92 +LINUX_KERNEL_HASH-5.15.92 = 9f420451db99a31a4aade9a46487b39318340d228f5c87c6dc56d83477e6ef91 diff --git a/target/linux/generic/pending-5.15/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch b/target/linux/generic/pending-5.15/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch index 60c7721df0..6f28e19a48 100644 --- a/target/linux/generic/pending-5.15/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch +++ b/target/linux/generic/pending-5.15/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch @@ -17,7 +17,7 @@ Signed-off-by: Alexander Duyck --- a/net/core/skbuff.c +++ b/net/core/skbuff.c -@@ -4348,6 +4348,15 @@ int skb_gro_receive(struct sk_buff *p, s +@@ -4347,6 +4347,15 @@ int skb_gro_receive(struct sk_buff *p, s if (unlikely(p->len + len >= 65536 || NAPI_GRO_CB(skb)->flush)) return -E2BIG; diff --git a/target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch b/target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch index e1335c8ebc..29aba20e97 100644 --- a/target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch +++ b/target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch @@ -14,7 +14,7 @@ Signed-off-by: René van Dorst --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -3998,6 +3998,7 @@ static const struct net_device_ops mtk_n +@@ -4227,6 +4227,7 @@ static const struct net_device_ops mtk_n static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) { @@ -22,7 +22,7 @@ Signed-off-by: René van Dorst const __be32 *_id = of_get_property(np, "reg", NULL); phy_interface_t phy_mode; struct phylink *phylink; -@@ -4126,6 +4127,9 @@ static int mtk_add_mac(struct mtk_eth *e +@@ -4355,6 +4356,9 @@ static int mtk_add_mac(struct mtk_eth *e register_netdevice_notifier(&mac->device_notifier); } From 712681458a65736d3fc625bb9c481c31b23c1f97 Mon Sep 17 00:00:00 2001 From: John Audia Date: Mon, 6 Feb 2023 06:28:36 -0500 Subject: [PATCH 22/39] kernel: bump 5.10 to 5.10.167 All patches automatically rebased. Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia --- include/kernel-5.10 | 4 ++-- .../backport-5.10/630-v5.15-page_pool_frag_support.patch | 2 +- ...skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/kernel-5.10 b/include/kernel-5.10 index 0c14e6b582..0198540361 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.10 = .166 -LINUX_KERNEL_HASH-5.10.166 = 0051a1780e5bda0efc68dafab7c728b8283d2b028fedb439418f478be7d3e1af +LINUX_VERSION-5.10 = .167 +LINUX_KERNEL_HASH-5.10.167 = d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 diff --git a/target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch b/target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch index dbcdac8590..340a02afa7 100644 --- a/target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch +++ b/target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch @@ -646,7 +646,7 @@ } /* Reposition in the original skb */ -@@ -5189,6 +5210,20 @@ bool skb_try_coalesce(struct sk_buff *to +@@ -5188,6 +5209,20 @@ bool skb_try_coalesce(struct sk_buff *to if (skb_cloned(to)) return false; diff --git a/target/linux/generic/pending-5.10/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch b/target/linux/generic/pending-5.10/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch index 5a145abed3..c464b8e7ff 100644 --- a/target/linux/generic/pending-5.10/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch +++ b/target/linux/generic/pending-5.10/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch @@ -17,7 +17,7 @@ Signed-off-by: Alexander Duyck --- a/net/core/skbuff.c +++ b/net/core/skbuff.c -@@ -4166,6 +4166,15 @@ int skb_gro_receive(struct sk_buff *p, s +@@ -4165,6 +4165,15 @@ int skb_gro_receive(struct sk_buff *p, s if (unlikely(p->len + len >= 65536 || NAPI_GRO_CB(skb)->flush)) return -E2BIG; From 1c31ca5da9aaa043069bcdb209248a8c26bf690a Mon Sep 17 00:00:00 2001 From: Felix Baumann Date: Wed, 8 Feb 2023 02:25:00 +0100 Subject: [PATCH 23/39] ipq4019: fix dts white-space Replace blanks with tabs Remove whitespace from otherwise empty lines Signed-off-by: Felix Baumann --- .../arm/boot/dts/qcom-ipq4018-dap-2610.dts | 8 +- .../arm/boot/dts/qcom-ipq4018-gl-a1300.dts | 12 +- .../arm/boot/dts/qcom-ipq4018-sxtsq-5-ac.dts | 12 +- .../dts/qcom-ipq4019-hap-ac3-lte6-kit.dts | 12 +- .../arm/boot/dts/qcom-ipq4019-whw03v2.dts | 708 +++++++++--------- .../arm/boot/dts/qcom-ipq4019-xx8300.dtsi | 14 +- .../arm/boot/dts/qcom-ipq4029-ap-303h.dts | 2 +- .../arm/boot/dts/qcom-ipq4029-ws-ap3915i.dts | 8 +- 8 files changed, 388 insertions(+), 388 deletions(-) diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts index 724047c469..493905d56d 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-dap-2610.dts @@ -182,17 +182,17 @@ }; &gmac { - status = "okay"; + status = "okay"; }; &switch { - status = "okay"; + status = "okay"; }; &swport5 { - status = "okay"; + status = "okay"; - label = "lan"; + label = "lan"; }; &tlmm { diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-a1300.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-a1300.dts index a742138cdf..ad3d1ac120 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-a1300.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-a1300.dts @@ -196,9 +196,9 @@ }; partition@180000 { - label = "log"; - reg = <0x00180000 0x00020000>; - }; + label = "log"; + reg = <0x00180000 0x00020000>; + }; }; }; @@ -262,9 +262,9 @@ }; &blsp1_i2c3 { - status = "okay"; - pinctrl-0 = <&i2c_0_pins>; - pinctrl-names = "default"; + status = "okay"; + pinctrl-0 = <&i2c_0_pins>; + pinctrl-names = "default"; }; &usb2 { diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-sxtsq-5-ac.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-sxtsq-5-ac.dts index 07fa80742e..de3fa96922 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-sxtsq-5-ac.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-sxtsq-5-ac.dts @@ -222,18 +222,18 @@ }; &gmac { - status = "okay"; + status = "okay"; }; &switch { - status = "okay"; + status = "okay"; - /delete-property/ psgmii-ethphy; + /delete-property/ psgmii-ethphy; }; &swport5 { - status = "okay"; + status = "okay"; - label = "lan"; - phy-mode = "rgmii"; + label = "lan"; + phy-mode = "rgmii"; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3-lte6-kit.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3-lte6-kit.dts index f6a42cfedb..6459fc3b92 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3-lte6-kit.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3-lte6-kit.dts @@ -158,12 +158,12 @@ line-name = "enable USB power"; }; - enable-mpcie-power { - gpio-hog; - gpios = <51 GPIO_ACTIVE_HIGH>; - output-high; - line-name = "enable mPCI-E power"; - }; + enable-mpcie-power { + gpio-hog; + gpios = <51 GPIO_ACTIVE_HIGH>; + output-high; + line-name = "enable mPCI-E power"; + }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-whw03v2.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-whw03v2.dts index e1e8cf2588..1f0572b879 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-whw03v2.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-whw03v2.dts @@ -7,513 +7,513 @@ #include / { - model = "Linksys WHW03 V2 (Velop)"; - compatible = "linksys,whw03v2", "qcom,ipq4019"; + model = "Linksys WHW03 V2 (Velop)"; + compatible = "linksys,whw03v2", "qcom,ipq4019"; - aliases { - led-boot = &led_blue; - led-failsafe = &led_red; - led-running = &led_green; - led-upgrade = &led_red; - }; + aliases { + led-boot = &led_blue; + led-failsafe = &led_red; + led-running = &led_green; + led-upgrade = &led_red; + }; - // The arguments rootfstype and ro are needed - // to override the default bootargs - chosen { - bootargs-append = " root=/dev/ubiblock0_0 rootfstype=squashfs ro"; - stdout-path = &blsp1_uart1; - }; + // The arguments rootfstype and ro are needed + // to override the default bootargs + chosen { + bootargs-append = " root=/dev/ubiblock0_0 rootfstype=squashfs ro"; + stdout-path = &blsp1_uart1; + }; - soc { - ess-tcsr@1953000 { - compatible = "qcom,tcsr"; - reg = <0x1953000 0x1000>; - qcom,ess-interface-select = ; - }; + soc { + ess-tcsr@1953000 { + compatible = "qcom,tcsr"; + reg = <0x1953000 0x1000>; + qcom,ess-interface-select = ; + }; - tcsr@1949000 { - compatible = "qcom,tcsr"; - reg = <0x1949000 0x100>; - qcom,wifi_glb_cfg = ; - }; + tcsr@1949000 { + compatible = "qcom,tcsr"; + reg = <0x1949000 0x100>; + qcom,wifi_glb_cfg = ; + }; - tcsr@194b000 { - compatible = "qcom,tcsr"; - reg = <0x194b000 0x100>; - qcom,usb-hsphy-mode-select = ; - }; + tcsr@194b000 { + compatible = "qcom,tcsr"; + reg = <0x194b000 0x100>; + qcom,usb-hsphy-mode-select = ; + }; - tcsr@1957000 { - compatible = "qcom,tcsr"; - reg = <0x1957000 0x100>; - qcom,wifi_noc_memtype_m0_m2 = ; - }; - }; + tcsr@1957000 { + compatible = "qcom,tcsr"; + reg = <0x1957000 0x100>; + qcom,wifi_noc_memtype_m0_m2 = ; + }; + }; - keys { - compatible = "gpio-keys"; + keys { + compatible = "gpio-keys"; - reset { - label = "reset"; - gpios = <&tlmm 18 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; + reset { + label = "reset"; + gpios = <&tlmm 18 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; }; &tlmm { - mdio_pins: mdio-pinmux { - mux-1 { - pins = "gpio6"; - function = "mdio"; - bias-pull-up; - }; + mdio_pins: mdio-pinmux { + mux-1 { + pins = "gpio6"; + function = "mdio"; + bias-pull-up; + }; - mux-2 { - pins = "gpio7"; - function = "mdc"; - bias-pull-up; - }; - }; + mux-2 { + pins = "gpio7"; + function = "mdc"; + bias-pull-up; + }; + }; - i2c_0_pins: i2c-0-pinmux { - mux { - function = "blsp_i2c0"; - pins = "gpio20", "gpio21"; - bias-disable; - }; - }; + i2c_0_pins: i2c-0-pinmux { + mux { + function = "blsp_i2c0"; + pins = "gpio20", "gpio21"; + bias-disable; + }; + }; - serial_0_pins: serial0-pinmux { - mux { - pins = "gpio16", "gpio17"; - function = "blsp_uart0"; - bias-disable; - }; - }; + serial_0_pins: serial0-pinmux { + mux { + pins = "gpio16", "gpio17"; + function = "blsp_uart0"; + bias-disable; + }; + }; - serial_1_pins: serial1-pinmux { - mux { - pins = "gpio8", "gpio9", "gpio10", "gpio11"; - function = "blsp_uart1"; - bias-disable; - }; - }; + serial_1_pins: serial1-pinmux { + mux { + pins = "gpio8", "gpio9", "gpio10", "gpio11"; + function = "blsp_uart1"; + bias-disable; + }; + }; - spi_0_pins: spi-0-pinmux { - mux { - function = "blsp_spi0"; - pins = "gpio13", "gpio14", "gpio15"; - drive-strength = <12>; - bias-disable; - }; + spi_0_pins: spi-0-pinmux { + mux { + function = "blsp_spi0"; + pins = "gpio13", "gpio14", "gpio15"; + drive-strength = <12>; + bias-disable; + }; - mux-cs { - pins = "gpio12"; - drive-strength = <2>; - bias-disable; - output-high; - }; - }; - - spi_1_pins: spi-1-pinmux { - mux-1 { - function = "blsp_spi1"; - pins = "gpio44", "gpio46","gpio47"; - bias-disable; - }; + mux-cs { + pins = "gpio12"; + drive-strength = <2>; + bias-disable; + output-high; + }; + }; - mux-2 { - pins = "gpio31", "gpio45", "gpio49"; - function = "gpio"; - bias-pull-up; - output-high; - }; + spi_1_pins: spi-1-pinmux { + mux-1 { + function = "blsp_spi1"; + pins = "gpio44", "gpio46","gpio47"; + bias-disable; + }; - host-interrupt { - pins = "gpio42"; - function = "gpio"; - input; - }; - }; + mux-2 { + pins = "gpio31", "gpio45", "gpio49"; + function = "gpio"; + bias-pull-up; + output-high; + }; - wifi_0_pins: wifi0-pinmux { - btcoexist { - bias-pull-up; - drive-strength = <6>; - function = "gpio"; - output-high; - pins = "gpio52"; - }; - }; + host-interrupt { + pins = "gpio42"; + function = "gpio"; + input; + }; + }; - zigbee-0 { - gpio-hog; - gpios = <29 GPIO_ACTIVE_HIGH>; - bias-disable; - output-low; - }; + wifi_0_pins: wifi0-pinmux { + btcoexist { + bias-pull-up; + drive-strength = <6>; + function = "gpio"; + output-high; + pins = "gpio52"; + }; + }; - zigbee-1 { - gpio-hog; - gpios = <50 GPIO_ACTIVE_HIGH>; - bias-disable; - input; - }; + zigbee-0 { + gpio-hog; + gpios = <29 GPIO_ACTIVE_HIGH>; + bias-disable; + output-low; + }; - bluetooth-enable { - gpio-hog; - gpios = <32 GPIO_ACTIVE_HIGH>; - output-high; - }; + zigbee-1 { + gpio-hog; + gpios = <50 GPIO_ACTIVE_HIGH>; + bias-disable; + input; + }; + + bluetooth-enable { + gpio-hog; + gpios = <32 GPIO_ACTIVE_HIGH>; + output-high; + }; }; &mdio { - status = "okay"; - pinctrl-0 = <&mdio_pins>; - pinctrl-names = "default"; - phy-reset-gpios = <&tlmm 19 GPIO_ACTIVE_LOW>; + status = "okay"; + pinctrl-0 = <&mdio_pins>; + pinctrl-names = "default"; + phy-reset-gpios = <&tlmm 19 GPIO_ACTIVE_LOW>; }; ðphy0 { - status = "disabled"; + status = "disabled"; }; ðphy1 { - status = "disabled"; + status = "disabled"; }; ðphy2 { - status = "disabled"; + status = "disabled"; }; ðphy3 { - reg = <0x1b>; + reg = <0x1b>; }; ðphy4 { - reg = <0x1c>; + reg = <0x1c>; }; &psgmiiphy { - reg = <0x1d>; + reg = <0x1d>; }; &watchdog { - status = "okay"; + status = "okay"; }; &prng { - status = "okay"; + status = "okay"; }; &blsp_dma { - status = "okay"; + status = "okay"; }; &cryptobam { - num-channels = <4>; - qcom,num-ees = <2>; + num-channels = <4>; + qcom,num-ees = <2>; - status = "okay"; + status = "okay"; }; &crypto { - status = "okay"; + status = "okay"; }; &blsp1_uart1 { - status = "okay"; - pinctrl-0 = <&serial_0_pins>; - pinctrl-names = "default"; + status = "okay"; + pinctrl-0 = <&serial_0_pins>; + pinctrl-names = "default"; }; &blsp1_uart2 { - status = "okay"; - pinctrl-0 = <&serial_1_pins>; - pinctrl-names = "default"; + status = "okay"; + pinctrl-0 = <&serial_1_pins>; + pinctrl-names = "default"; - bluetooth { - compatible = "csr,8811"; + bluetooth { + compatible = "csr,8811"; - enable-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>; - }; + enable-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>; + }; }; &blsp1_spi2 { - pinctrl-0 = <&spi_1_pins>; - pinctrl-names = "default"; - status = "okay"; + pinctrl-0 = <&spi_1_pins>; + pinctrl-names = "default"; + status = "okay"; - cs-gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>; + cs-gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>; - zigbee@0 { - #address-cells = <1>; - #size-cells = <0>; + zigbee@0 { + #address-cells = <1>; + #size-cells = <0>; - compatible = "silabs,em3581"; - reg = <0>; - spi-max-frequency = <12000000>; - }; + compatible = "silabs,em3581"; + reg = <0>; + spi-max-frequency = <12000000>; + }; }; &blsp1_i2c3 { - pinctrl-0 = <&i2c_0_pins>; - pinctrl-names = "default"; - - status = "okay"; + pinctrl-0 = <&i2c_0_pins>; + pinctrl-names = "default"; - // RGB LEDs - pca9633: led-controller { - compatible = "nxp,pca9633"; - nxp,hw-blink; - reg = <0x62>; - #address-cells = <1>; - #size-cells = <0>; + status = "okay"; - led_red: red@0 { - label = "red"; - color = ; - function = LED_FUNCTION_INDICATOR; - linux,default-trigger = "none"; - reg = <0>; - }; + // RGB LEDs + pca9633: led-controller { + compatible = "nxp,pca9633"; + nxp,hw-blink; + reg = <0x62>; + #address-cells = <1>; + #size-cells = <0>; - led_green: green@1 { - label = "green"; - color = ; - function = LED_FUNCTION_INDICATOR; - linux,default-trigger = "none"; - reg = <1>; - }; + led_red: red@0 { + label = "red"; + color = ; + function = LED_FUNCTION_INDICATOR; + linux,default-trigger = "none"; + reg = <0>; + }; - led_blue: blue@2 { - label = "blue"; - color = ; - function = LED_FUNCTION_INDICATOR; - linux,default-trigger = "default-on"; - reg = <2>; - }; - }; + led_green: green@1 { + label = "green"; + color = ; + function = LED_FUNCTION_INDICATOR; + linux,default-trigger = "none"; + reg = <1>; + }; + + led_blue: blue@2 { + label = "blue"; + color = ; + function = LED_FUNCTION_INDICATOR; + linux,default-trigger = "default-on"; + reg = <2>; + }; + }; }; &usb3_ss_phy { - status = "okay"; + status = "okay"; }; &usb3_hs_phy { - status = "okay"; + status = "okay"; }; &usb2_hs_phy { - status = "okay"; + status = "okay"; }; &nand { - status = "okay"; + status = "okay"; - nand@0 { - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; + nand@0 { + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - partition@0 { - label = "SBL1"; - reg = <0x0 0x100000>; - read-only; - }; + partition@0 { + label = "SBL1"; + reg = <0x0 0x100000>; + read-only; + }; - partition@100000 { - label = "MIBIB"; - reg = <0x100000 0x100000>; - read-only; - }; + partition@100000 { + label = "MIBIB"; + reg = <0x100000 0x100000>; + read-only; + }; - partition@200000 { - label = "QSEE"; - reg = <0x200000 0x100000>; - read-only; - }; + partition@200000 { + label = "QSEE"; + reg = <0x200000 0x100000>; + read-only; + }; - partition@300000 { - label = "CDT"; - reg = <0x300000 0x80000>; - read-only; - }; + partition@300000 { + label = "CDT"; + reg = <0x300000 0x80000>; + read-only; + }; - partition@380000 { - label = "APPSBL"; - reg = <0x380000 0x200000>; - read-only; - }; + partition@380000 { + label = "APPSBL"; + reg = <0x380000 0x200000>; + read-only; + }; - partition@580000 { - label = "ART"; - reg = <0x580000 0x80000>; - compatible = "nvmem-cells"; - #address-cells = <1>; - #size-cells = <1>; - read-only; + partition@580000 { + label = "ART"; + reg = <0x580000 0x80000>; + compatible = "nvmem-cells"; + #address-cells = <1>; + #size-cells = <1>; + read-only; - precal_art_1000: precal@1000 { - reg = <0x1000 0x2f20>; - }; + precal_art_1000: precal@1000 { + reg = <0x1000 0x2f20>; + }; - precal_art_5000: precal@5000 { - reg = <0x5000 0x2f20>; - }; + precal_art_5000: precal@5000 { + reg = <0x5000 0x2f20>; + }; - precal_art_9000: precal@9000 { - reg = <0x9000 0x2f20>; - }; + precal_art_9000: precal@9000 { + reg = <0x9000 0x2f20>; + }; - macaddr_gmac0: macaddr@0 { - reg = <0x0 0x6>; - }; + macaddr_gmac0: macaddr@0 { + reg = <0x0 0x6>; + }; - macaddr_gmac1: macaddr@6 { - reg = <0x6 0x6>; - }; - }; + macaddr_gmac1: macaddr@6 { + reg = <0x6 0x6>; + }; + }; - partition@600000 { - label = "u_env"; - reg = <0x600000 0x80000>; - }; + partition@600000 { + label = "u_env"; + reg = <0x600000 0x80000>; + }; - partition@680000 { - label = "s_env"; - reg = <0x680000 0x40000>; - }; + partition@680000 { + label = "s_env"; + reg = <0x680000 0x40000>; + }; - partition@6c0000 { - label = "devinfo"; - reg = <0x6c0000 0x40000>; - read-only; - }; + partition@6c0000 { + label = "devinfo"; + reg = <0x6c0000 0x40000>; + read-only; + }; - partition@700000 { - label = "kernel"; - reg = <0x700000 0xa100000>; - }; + partition@700000 { + label = "kernel"; + reg = <0x700000 0xa100000>; + }; - partition@d00000 { - label = "rootfs"; - reg = <0xd00000 0x9b00000>; - }; + partition@d00000 { + label = "rootfs"; + reg = <0xd00000 0x9b00000>; + }; - partition@a800000 { - label = "alt_kernel"; - reg = <0xa800000 0xa100000>; - }; + partition@a800000 { + label = "alt_kernel"; + reg = <0xa800000 0xa100000>; + }; - partition@ae00000 { - label = "alt_rootfs"; - reg = <0xae00000 0x9b00000>; - }; + partition@ae00000 { + label = "alt_rootfs"; + reg = <0xae00000 0x9b00000>; + }; - partition@14900000 { - label = "sysdiag"; - reg = <0x14900000 0x200000>; - read-only; - }; + partition@14900000 { + label = "sysdiag"; + reg = <0x14900000 0x200000>; + read-only; + }; - partition@14b00000 { - label = "syscfg"; - reg = <0x14b00000 0xb500000>; - read-only; - }; - }; - }; + partition@14b00000 { + label = "syscfg"; + reg = <0x14b00000 0xb500000>; + read-only; + }; + }; + }; }; &pcie0 { - status = "okay"; + status = "okay"; - perst-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>; - wake-gpios = <&tlmm 40 GPIO_ACTIVE_LOW>; - clkreq-gpios = <&tlmm 39 GPIO_ACTIVE_LOW>; + perst-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>; + wake-gpios = <&tlmm 40 GPIO_ACTIVE_LOW>; + clkreq-gpios = <&tlmm 39 GPIO_ACTIVE_LOW>; - bridge@0,0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - ranges; + bridge@0,0 { + reg = <0x00000000 0 0 0 0>; + #address-cells = <3>; + #size-cells = <2>; + ranges; - wifi2: wifi@1,0 { - compatible = "qcom,ath10k"; - reg = <0x00010000 0 0 0 0>; - }; - }; + wifi2: wifi@1,0 { + compatible = "qcom,ath10k"; + reg = <0x00010000 0 0 0 0>; + }; + }; }; &qpic_bam { - status = "okay"; + status = "okay"; }; &gmac { - status = "okay"; + status = "okay"; }; &switch { - status = "okay"; + status = "okay"; }; &swport4 { - status = "okay"; - label = "lan"; + status = "okay"; + label = "lan"; - nvmem-cell-names = "mac-address"; - nvmem-cells = <&macaddr_gmac1>; + nvmem-cell-names = "mac-address"; + nvmem-cells = <&macaddr_gmac1>; }; &swport5 { - status = "okay"; - label = "wan"; + status = "okay"; + label = "wan"; - nvmem-cell-names = "mac-address"; - nvmem-cells = <&macaddr_gmac0>; + nvmem-cell-names = "mac-address"; + nvmem-cells = <&macaddr_gmac0>; }; &wifi0 { - pinctrl-0 = <&wifi_0_pins>; - pinctrl-names = "default"; + pinctrl-0 = <&wifi_0_pins>; + pinctrl-names = "default"; - status = "okay"; + status = "okay"; - qcom,coexist-support = <1>; - qcom,coexist-gpio-pin = <0x34>; + qcom,coexist-support = <1>; + qcom,coexist-gpio-pin = <0x34>; - ieee80211-freq-limit = <2401000 2473000>; - qcom,ath10k-calibration-variant = "linksys-whw03v2"; + ieee80211-freq-limit = <2401000 2473000>; + qcom,ath10k-calibration-variant = "linksys-whw03v2"; - nvmem-cell-names = "pre-calibration", "mac-address"; - nvmem-cells = <&precal_art_1000>, <&macaddr_gmac0>; - mac-address-increment = <1>; + nvmem-cell-names = "pre-calibration", "mac-address"; + nvmem-cells = <&precal_art_1000>, <&macaddr_gmac0>; + mac-address-increment = <1>; }; &wifi1 { - status = "okay"; - - ieee80211-freq-limit = <5170000 5250000>; - qcom,ath10k-calibration-variant = "linksys-whw03v2"; - - nvmem-cell-names = "pre-calibration", "mac-address"; - nvmem-cells = <&precal_art_5000>, <&macaddr_gmac0>; - mac-address-increment = <2>; + status = "okay"; + + ieee80211-freq-limit = <5170000 5250000>; + qcom,ath10k-calibration-variant = "linksys-whw03v2"; + + nvmem-cell-names = "pre-calibration", "mac-address"; + nvmem-cells = <&precal_art_5000>, <&macaddr_gmac0>; + mac-address-increment = <2>; }; &wifi2 { - status = "okay"; + status = "okay"; - ieee80211-freq-limit = <5735000 5835000>; - qcom,ath10k-calibration-variant = "linksys-whw03v2"; + ieee80211-freq-limit = <5735000 5835000>; + qcom,ath10k-calibration-variant = "linksys-whw03v2"; - nvmem-cell-names = "pre-calibration", "mac-address"; - nvmem-cells = <&precal_art_9000>, <&macaddr_gmac0>; - mac-address-increment = <3>; + nvmem-cell-names = "pre-calibration", "mac-address"; + nvmem-cells = <&precal_art_9000>, <&macaddr_gmac0>; + mac-address-increment = <3>; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi index 51a37290a0..db9ca1e725 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi @@ -288,29 +288,29 @@ }; &gmac { - status = "okay"; + status = "okay"; }; &switch { - status = "okay"; + status = "okay"; }; &swport1 { - status = "okay"; + status = "okay"; }; &swport2 { - status = "okay"; + status = "okay"; }; &swport3 { - status = "okay"; + status = "okay"; }; &swport4 { - status = "okay"; + status = "okay"; }; &swport5 { - status = "okay"; + status = "okay"; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts index 86f4514317..23abb3537c 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts @@ -92,7 +92,7 @@ /* No driver */ compatible = "isl,isl28022"; reg = <0x40>; - }; + }; }; }; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ws-ap3915i.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ws-ap3915i.dts index 08874bcf4f..8794d839a8 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ws-ap3915i.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ws-ap3915i.dts @@ -125,17 +125,17 @@ }; &gmac { - status = "okay"; + status = "okay"; }; &switch { - status = "okay"; + status = "okay"; }; &swport5 { - status = "okay"; + status = "okay"; - label = "lan"; + label = "lan"; }; &tlmm { From 721206a1b14fc5eba7ba8e20d979b26baf934e0d Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Wed, 8 Feb 2023 12:30:42 +0100 Subject: [PATCH 24/39] kernel: set default values for ARM low level debugging symbols Set default values for KERNEL_DEBUG_LL and KERNEL_DEBUG_LL_UART_NONE again as both of these symbols are non visible if KERNEL_EARLY_PRINTK is not selected and KConfig wont write their value to .config. This usually is the intended behaviour, but in OpenWrt we are relying on the KConfig to set these and disable the debug console settings that multiple targets like mvebu have set in their kernel config. This was the behaviour before removing all of the "default n" settings as KConfig by default considers symbols disabled but they are not visible anymore and thus their value is not set in .config and build system then later does not override the values from target kernel config. So, to restore the behaviour to the previous one lets a default value for KERNEL_DEBUG_LL and KERNEL_DEBUG_LL_UART_NONE. Fixes: 8bc72ea7be39 ("treewide: strip useless default n Kconfig lines") Tested-by: Georgi Valkov Signed-off-by: Robert Marko --- config/Config-kernel.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/Config-kernel.in b/config/Config-kernel.in index 500f72672d..258163984e 100644 --- a/config/Config-kernel.in +++ b/config/Config-kernel.in @@ -387,12 +387,18 @@ config KERNEL_DEBUG_INFO_REDUCED DEBUG_INFO build and compile times are reduced too. Only works with newer gcc versions. +# KERNEL_DEBUG_LL symbols must have the default value set as otherwise +# KConfig wont evaluate them unless KERNEL_EARLY_PRINTK is selected +# which means that buildroot wont override the DEBUG_LL symbols in target +# kernel configurations and lead to devices that dont have working console config KERNEL_DEBUG_LL_UART_NONE bool + default n depends on arm config KERNEL_DEBUG_LL bool + default n depends on arm select KERNEL_DEBUG_LL_UART_NONE help From dd39f760b75070dfc6589fa9e63e3a1525bd7e2c Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Tue, 31 Jan 2023 11:27:00 +0100 Subject: [PATCH 25/39] toolchain/binutils: use explicit configure args Spell out what we want to enable or disable. This prevents host libs to leak in, so everyone get the same feature set. Signed-off-by: Andre Heider --- toolchain/binutils/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index cf65e83e6f..a0e112f8f6 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -43,8 +43,12 @@ HOST_CONFIGURE_ARGS = \ --host=$(GNU_HOST_NAME) \ --target=$(REAL_GNU_TARGET_NAME) \ --with-sysroot=$(TOOLCHAIN_DIR) \ + --with-system-zlib \ + --without-zstd \ --enable-deterministic-archives \ --enable-plugins \ + --enable-lto \ + --disable-gprofng \ --disable-multilib \ --disable-werror \ --disable-nls \ From 4b8b89da506d1272ccbf944b1ece6c8ddaeff2ed Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Tue, 31 Jan 2023 12:04:00 +0100 Subject: [PATCH 26/39] toolchain/gcc: use explicit configure args Spell out what we want to enable or disable. This prevents host libs to leak in, so everyone get the same feature set. Signed-off-by: Andre Heider --- toolchain/gcc/common.mk | 2 ++ toolchain/gcc/final/Makefile | 1 + 2 files changed, 3 insertions(+) diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk index 7eae855eea..5f314c7fc0 100644 --- a/toolchain/gcc/common.mk +++ b/toolchain/gcc/common.mk @@ -106,6 +106,8 @@ GCC_CONFIGURE:= \ --with-abi=$(call qstrip,$(CONFIG_MIPS64_ABI))) \ $(if $(CONFIG_arc),--with-cpu=$(CONFIG_CPU_TYPE)) \ $(if $(CONFIG_powerpc64), $(if $(CONFIG_USE_MUSL),--with-abi=elfv2)) \ + --with-system-zlib=$(STAGING_DIR_HOST) \ + --without-zstd \ --with-gmp=$(STAGING_DIR_HOST) \ --with-mpfr=$(STAGING_DIR_HOST) \ --with-mpc=$(STAGING_DIR_HOST) \ diff --git a/toolchain/gcc/final/Makefile b/toolchain/gcc/final/Makefile index 049ddf61f0..78a5576bff 100644 --- a/toolchain/gcc/final/Makefile +++ b/toolchain/gcc/final/Makefile @@ -8,6 +8,7 @@ GCC_CONFIGURE += \ --enable-shared \ --enable-threads \ --with-slibdir=$(TOOLCHAIN_DIR)/lib \ + --enable-plugins \ --enable-lto \ --with-libelf=$(STAGING_DIR_HOST) From ad564cb0197865bb6caecd6a0ea628249c08afb2 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Tue, 31 Jan 2023 09:30:18 +0100 Subject: [PATCH 27/39] toolchain/gcc: clean up CFLAGS Instead of having two different ways to pass flags to the gcc build process, add them as configure args, which is a reliable way to let gcc pass them around to its various pieces. Also add CXXFLAGS, since gcc started to use c++ for itself recently (~10 years ago now). Signed-off-by: Andre Heider --- toolchain/gcc/common.mk | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk index 5f314c7fc0..e885141538 100644 --- a/toolchain/gcc/common.mk +++ b/toolchain/gcc/common.mk @@ -79,10 +79,6 @@ endif GCC_CONFIGURE:= \ SHELL="$(BASH)" \ - $(if $(shell gcc --version 2>&1 | grep -E "Apple.(LLVM|clang)"), \ - CFLAGS="-O2 -fbracket-depth=512 -pipe" \ - CXXFLAGS="-O2 -fbracket-depth=512 -pipe" \ - ) \ $(HOST_SOURCE_DIR)/configure \ --with-bugurl=$(BUGURL) \ --with-pkgversion="$(PKGVERSION)" \ @@ -166,13 +162,21 @@ ifeq ($(CONFIG_TARGET_x86)$(CONFIG_USE_GLIBC)$(CONFIG_INSTALL_GCCGO),yyy) TARGET_CFLAGS+=-fno-split-stack endif +CFLAGS:=$(HOST_CFLAGS) -pipe +ifneq ($(shell gcc --version 2>&1 | grep -E "Apple.(LLVM|clang)"),) + CFLAGS+= -fbracket-depth=512 +endif + +GCC_CONFIGURE+= \ + CFLAGS="$(CFLAGS)" \ + CXXFLAGS="$(CFLAGS)" \ + CFLAGS_FOR_TARGET="$(TARGET_CFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(TARGET_CFLAGS)" \ + GOCFLAGS_FOR_TARGET="$(TARGET_CFLAGS)" + GCC_MAKE:= \ export SHELL="$(BASH)"; \ - $(MAKE) \ - CFLAGS="$(HOST_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(TARGET_CFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(TARGET_CFLAGS)" \ - GOCFLAGS_FOR_TARGET="$(TARGET_CFLAGS)" + $(MAKE) define Host/SetToolchainInfo $(SED) 's,TARGET_CROSS=.*,TARGET_CROSS=$(REAL_GNU_TARGET_NAME)-,' $(TOOLCHAIN_DIR)/info.mk From e704a2b57bd9f593e0133a44bd7b35986152d864 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 24 Sep 2022 18:42:59 -0700 Subject: [PATCH 28/39] tools/zstd: build libraries as static Enables to get rid of rpath hack for all users. Signed-off-by: Rosen Penev --- tools/zstd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/zstd/Makefile b/tools/zstd/Makefile index 93f6745976..65381e7cb4 100644 --- a/tools/zstd/Makefile +++ b/tools/zstd/Makefile @@ -17,9 +17,9 @@ include $(INCLUDE_DIR)/meson.mk MESON_HOST_BUILD_DIR:=$(HOST_BUILD_DIR)/build/meson/openwrt-build HOSTCC:= $(HOSTCC_NOCACHE) -HOST_LDFLAGS += -Wl,-rpath,$(STAGING_DIR_HOST)/lib MESON_HOST_ARGS += \ + -Ddefault_library=static \ -Dlegacy_level=7 \ -Ddebug_level=0 \ -Dbacktrace=false \ From 786c4099b4f65f6f323096db6480c28a79676a16 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 30 Sep 2022 13:18:00 -0700 Subject: [PATCH 29/39] tools/cmake: remove rpath ldflag no longer needed because of tools/zstd Signed-off-by: Rosen Penev --- tools/cmake/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile index ed2580fe4c..3a81b9a29f 100644 --- a/tools/cmake/Makefile +++ b/tools/cmake/Makefile @@ -38,8 +38,6 @@ HOST_CONFIGURE_ARGS := \ --system-zstd \ --generator=Ninja -HOST_LDFLAGS += -Wl,-rpath,$(STAGING_DIR_HOST)/lib - define Host/Compile/Default +$(NINJA) -C $(HOST_BUILD_DIR) $(1) endef From 7fd28f2e3a640b88439af1a555c0fd24674ae7cb Mon Sep 17 00:00:00 2001 From: Felix Baumann Date: Wed, 8 Feb 2023 03:45:59 +0100 Subject: [PATCH 30/39] ipq40xx: fix dts whitespace Remove whitespace from otherwise empty lines Signed-off-by: Felix Baumann --- .../ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf18a.dts | 2 +- .../ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-x1pro.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf18a.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf18a.dts index c1832ee49f..75b5fd39a9 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf18a.dts +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf18a.dts @@ -54,7 +54,7 @@ gpios = <&tlmm 23 GPIO_ACTIVE_HIGH>; linux,default-trigger = "phy0tpt"; }; - + led-3 { label = "red:wlan"; gpios = <&tlmm 26 GPIO_ACTIVE_HIGH>; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-x1pro.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-x1pro.dtsi index 742bd5b570..3de6a10433 100644 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-x1pro.dtsi +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-x1pro.dtsi @@ -15,7 +15,7 @@ serial0 = &blsp1_uart1; serial1 = &blsp1_uart2; }; - + soc { rng@22000 { From d0c64ae6953c08b2a0b9ecc5d0a24d884ccc8ad5 Mon Sep 17 00:00:00 2001 From: Felix Baumann Date: Wed, 8 Feb 2023 03:18:44 +0100 Subject: [PATCH 31/39] ath79: fix dts whitespace Replace blanks with tabs Remove whitespace from otherwise empty lines Signed-off-by: Felix Baumann --- .../ath79/dts/ar7161_trendnet_tew-673gru.dts | 2 +- .../ar9342_mikrotik_routerboard-912uag-2hpnd.dts | 10 +++++----- .../ath79/dts/ar9344_tplink_tl-wr841hp-v2.dts | 16 ++++++++-------- target/linux/ath79/dts/ar9344_wd_mynet-n600.dts | 16 ++++++++-------- .../ath79/dts/qca9558_ubnt_nanobeam-ac-xc.dts | 2 +- .../ath79/dts/qca9563_tplink_deco-m4r-v1.dts | 14 +++++++------- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/target/linux/ath79/dts/ar7161_trendnet_tew-673gru.dts b/target/linux/ath79/dts/ar7161_trendnet_tew-673gru.dts index b6d66a08a5..a770ca04a8 100644 --- a/target/linux/ath79/dts/ar7161_trendnet_tew-673gru.dts +++ b/target/linux/ath79/dts/ar7161_trendnet_tew-673gru.dts @@ -58,7 +58,7 @@ }; }; }; - + virtual_flash { compatible = "mtd-concat"; devices = <&fwconcat0 &fwconcat1>; diff --git a/target/linux/ath79/dts/ar9342_mikrotik_routerboard-912uag-2hpnd.dts b/target/linux/ath79/dts/ar9342_mikrotik_routerboard-912uag-2hpnd.dts index 28a88db5df..cda96494e7 100644 --- a/target/linux/ath79/dts/ar9342_mikrotik_routerboard-912uag-2hpnd.dts +++ b/target/linux/ath79/dts/ar9342_mikrotik_routerboard-912uag-2hpnd.dts @@ -10,11 +10,11 @@ model = "MikroTik RouterBOARD 912UAG-2HPnD"; aliases { - led-boot = &led_power; - led-failsafe = &led_power; - led-running = &led_power; - led-upgrade = &led_power; - }; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + }; gpio_key: gpio_key { compatible = "mikrotik,gpio-rb91x-key"; diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wr841hp-v2.dts b/target/linux/ath79/dts/ar9344_tplink_tl-wr841hp-v2.dts index 360443565b..49526fb6d2 100644 --- a/target/linux/ath79/dts/ar9344_tplink_tl-wr841hp-v2.dts +++ b/target/linux/ath79/dts/ar9344_tplink_tl-wr841hp-v2.dts @@ -16,7 +16,7 @@ led-upgrade = &led_system; label-mac-device = &wmac; }; - + keys { compatible = "gpio-keys"; @@ -26,7 +26,7 @@ debounce-interval = <60>; }; }; - + leds { compatible = "gpio-leds"; @@ -54,12 +54,12 @@ label = "green:lan4"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; - + wps { label = "green:wps"; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; - + wlan { label = "green:wlan"; gpios = <&gpio 21 GPIO_ACTIVE_LOW>; @@ -130,16 +130,16 @@ &wmac { status = "okay"; - + mtd-cal-data = <&art 0x1000>; - + nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cell-names = "mac-address"; }; ð0 { status = "okay"; - + phy-handle = <&swphy0>; nvmem-cells = <&macaddr_uboot_1fc00>; @@ -152,7 +152,7 @@ nvmem-cells = <&macaddr_uboot_1fc00>; nvmem-cell-names = "mac-address"; - + gmac-config { device = <&gmac>; switch-phy-swap = <1>; diff --git a/target/linux/ath79/dts/ar9344_wd_mynet-n600.dts b/target/linux/ath79/dts/ar9344_wd_mynet-n600.dts index 81788fb348..3c0e9c56a1 100644 --- a/target/linux/ath79/dts/ar9344_wd_mynet-n600.dts +++ b/target/linux/ath79/dts/ar9344_wd_mynet-n600.dts @@ -18,27 +18,27 @@ compatible = "gpio-leds"; led-0 { - color = ; - function = LED_FUNCTION_WLAN; + color = ; + function = LED_FUNCTION_WLAN; gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; }; led_power: led-1 { label = "blue:power"; - color = ; - function = LED_FUNCTION_POWER; + color = ; + function = LED_FUNCTION_POWER; gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; }; led-2 { - color = ; - function = LED_FUNCTION_WAN; + color = ; + function = LED_FUNCTION_WAN; gpios = <&gpio 12 GPIO_ACTIVE_HIGH>; }; led-3 { - color = ; - function = LED_FUNCTION_WPS; + color = ; + function = LED_FUNCTION_WPS; gpios = <&gpio 13 GPIO_ACTIVE_HIGH>; }; }; diff --git a/target/linux/ath79/dts/qca9558_ubnt_nanobeam-ac-xc.dts b/target/linux/ath79/dts/qca9558_ubnt_nanobeam-ac-xc.dts index dce88ac218..91675ff615 100644 --- a/target/linux/ath79/dts/qca9558_ubnt_nanobeam-ac-xc.dts +++ b/target/linux/ath79/dts/qca9558_ubnt_nanobeam-ac-xc.dts @@ -5,7 +5,7 @@ * Copyright (C) 2022 Daniel González Cabanelas * based on device tree from qca9558_ubnt_powerbeam-5ac-500.dts */ - + #include "qca955x_ubnt_xc.dtsi" / { diff --git a/target/linux/ath79/dts/qca9563_tplink_deco-m4r-v1.dts b/target/linux/ath79/dts/qca9563_tplink_deco-m4r-v1.dts index 4b2d80aa82..8cd9004bd3 100644 --- a/target/linux/ath79/dts/qca9563_tplink_deco-m4r-v1.dts +++ b/target/linux/ath79/dts/qca9563_tplink_deco-m4r-v1.dts @@ -24,7 +24,7 @@ gpios = <&gpio 1 GPIO_ACTIVE_LOW>; linux,default-trigger = "phy1tpt"; }; - + led_power: power { label = "green:power"; gpios = <&gpio 7 GPIO_ACTIVE_LOW>; @@ -41,7 +41,7 @@ keys { compatible = "gpio-keys"; - + reset { label = "Reset button"; linux,code = ; @@ -83,19 +83,19 @@ compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; - + uboot: partition@0 { label = "u-boot"; reg = <0x000000 0x080000>; read-only; }; - + partition@80000 { compatible = "denx,uimage"; label = "firmware"; reg = <0x080000 0xe00000>; }; - + partition@e80000 { label = "product-info"; reg = <0xe80000 0x05000>; @@ -107,7 +107,7 @@ reg = <0xe85000 0x16b000>; read-only; }; - + art: partition@ff0000 { label = "art"; reg = <0xff0000 0x010000>; @@ -122,7 +122,7 @@ phy-mode = "sgmii"; phy-handle = <&phy0>; - + nvmem-cells = <&macaddr_config_8>; nvmem-cell-names = "mac-address"; }; From 836b994132eeb11e09b70515ca8da562b25fad2b Mon Sep 17 00:00:00 2001 From: Felix Baumann Date: Wed, 8 Feb 2023 03:47:53 +0100 Subject: [PATCH 32/39] bcm63xx: fix dts whitespace Remove whitespace from otherwise empty lines Signed-off-by: Felix Baumann --- target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s-vfes.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s-vfes.dts b/target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s-vfes.dts index bd69ccd316..5349a54356 100644 --- a/target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s-vfes.dts +++ b/target/linux/bcm63xx/dts/bcm63167-sercomm-h500-s-vfes.dts @@ -4,7 +4,7 @@ * * Copyright (C) 2020 Daniel González Cabanelas */ - + #include "bcm63167-sercomm-h500-s.dtsi" / { From 505cf10e8392cc58056014e983bc2fd91ed236c1 Mon Sep 17 00:00:00 2001 From: Felix Baumann Date: Wed, 8 Feb 2023 03:21:47 +0100 Subject: [PATCH 33/39] ipq806x: fix dts whitespace Replace blanks with tabs Signed-off-by: Felix Baumann --- .../boot/dts/qcom-ipq8064-ad7200-c2600.dtsi | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-ad7200-c2600.dtsi b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-ad7200-c2600.dtsi index 7b352edb9b..3494b2bde2 100644 --- a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-ad7200-c2600.dtsi +++ b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8064-ad7200-c2600.dtsi @@ -11,15 +11,15 @@ }; reserved-memory { - ramoops@42100000 { - compatible = "ramoops"; - reg = <0x42100000 0x40000>; - record-size = <0x4000>; - console-size = <0x4000>; - ftrace-size = <0x4000>; - pmsg-size = <0x4000>; - }; - }; + ramoops@42100000 { + compatible = "ramoops"; + reg = <0x42100000 0x40000>; + record-size = <0x4000>; + console-size = <0x4000>; + ftrace-size = <0x4000>; + pmsg-size = <0x4000>; + }; + }; aliases { mdio-gpio0 = &mdio0; From abdb9f327ed802d946bfd96c5e9da6739765698e Mon Sep 17 00:00:00 2001 From: Felix Baumann Date: Wed, 8 Feb 2023 03:22:50 +0100 Subject: [PATCH 34/39] ipq807x: fix dts whitespace Replace blanks with tabs Signed-off-by: Felix Baumann --- .../ipq807x/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts b/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts index d3e788a36c..5521a480b8 100644 --- a/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts +++ b/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts @@ -199,7 +199,7 @@ function = "gpio"; drive-strength = <8>; bias-pull-down; - }; + }; }; &blsp1_uart5 { From fc4bf73d391880adeb47ab5b2f1d8b812c0cbabf Mon Sep 17 00:00:00 2001 From: Felix Baumann Date: Wed, 8 Feb 2023 03:23:18 +0100 Subject: [PATCH 35/39] kirkwood: fix dts whitespace Replace blanks with tabs Signed-off-by: Felix Baumann --- .../linux/kirkwood/files/arch/arm/boot/dts/kirkwood-nsa310s.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-nsa310s.dts b/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-nsa310s.dts index a2a718077e..a72276ed72 100644 --- a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-nsa310s.dts +++ b/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-nsa310s.dts @@ -258,7 +258,7 @@ }; &pciec { - status = "okay"; + status = "okay"; }; &pcie0 { From d88e2aa79425884619e28deade98db46f336c11d Mon Sep 17 00:00:00 2001 From: Felix Baumann Date: Wed, 8 Feb 2023 03:23:40 +0100 Subject: [PATCH 36/39] mediatek: fix dts whitespace Replace blanks with tabs Signed-off-by: Felix Baumann --- .../arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nor.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nor.dts b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nor.dts index 8d94069dcf..6342981304 100644 --- a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nor.dts +++ b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nor.dts @@ -3,7 +3,7 @@ #include "mt7986a-rfb.dtsi" / { - compatible = "mediatek,mt7986a-rfb-snor"; + compatible = "mediatek,mt7986a-rfb-snor"; }; &spi0 { From d87482a8db908e899bc101242896089cc8b12036 Mon Sep 17 00:00:00 2001 From: Felix Baumann Date: Wed, 8 Feb 2023 03:24:21 +0100 Subject: [PATCH 37/39] ramips: fix dts whitespace Replace blanks with tabs Remove whitespace from otherwise empty lines Signed-off-by: Felix Baumann --- target/linux/ramips/dts/mt7621_asus_rp-ac56.dts | 14 +++++++------- .../linux/ramips/dts/mt7621_dlink_dir-3060-a1.dts | 2 +- .../linux/ramips/dts/mt7621_keenetic_kn-3010.dts | 2 +- .../linux/ramips/dts/mt7621_linksys_ea6350-v4.dts | 2 +- target/linux/ramips/dts/mt7621_oraybox_x3a.dts | 2 +- target/linux/ramips/dts/mt7621_zyxel_nwa50ax.dts | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/target/linux/ramips/dts/mt7621_asus_rp-ac56.dts b/target/linux/ramips/dts/mt7621_asus_rp-ac56.dts index 5ae0ca6e82..50047999be 100644 --- a/target/linux/ramips/dts/mt7621_asus_rp-ac56.dts +++ b/target/linux/ramips/dts/mt7621_asus_rp-ac56.dts @@ -106,7 +106,7 @@ }; &gpio { - status = "okay"; + status = "okay"; }; &spi0 { @@ -208,12 +208,12 @@ }; &switch0 { - ports { - port@0 { - status = "okay"; - label = "lan"; - }; - }; + ports { + port@0 { + status = "okay"; + label = "lan"; + }; + }; }; &xhci { diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-3060-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-3060-a1.dts index 675a3aa631..943143ad63 100644 --- a/target/linux/ramips/dts/mt7621_dlink_dir-3060-a1.dts +++ b/target/linux/ramips/dts/mt7621_dlink_dir-3060-a1.dts @@ -55,7 +55,7 @@ label = "white:net"; gpios = <&gpio 3 GPIO_ACTIVE_LOW>; }; - + usb2_white { label = "white:usb2"; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; diff --git a/target/linux/ramips/dts/mt7621_keenetic_kn-3010.dts b/target/linux/ramips/dts/mt7621_keenetic_kn-3010.dts index 5a771f139c..69080df682 100644 --- a/target/linux/ramips/dts/mt7621_keenetic_kn-3010.dts +++ b/target/linux/ramips/dts/mt7621_keenetic_kn-3010.dts @@ -65,7 +65,7 @@ label = "wps"; gpios = <&gpio 41 GPIO_ACTIVE_LOW>; linux,code = ; - }; + }; }; virtual_flash { diff --git a/target/linux/ramips/dts/mt7621_linksys_ea6350-v4.dts b/target/linux/ramips/dts/mt7621_linksys_ea6350-v4.dts index 654c9aa70f..71e8dcedbf 100644 --- a/target/linux/ramips/dts/mt7621_linksys_ea6350-v4.dts +++ b/target/linux/ramips/dts/mt7621_linksys_ea6350-v4.dts @@ -8,7 +8,7 @@ }; &gmac1 { - phy-handle = <ðphy4>; + phy-handle = <ðphy4>; }; &mdio { diff --git a/target/linux/ramips/dts/mt7621_oraybox_x3a.dts b/target/linux/ramips/dts/mt7621_oraybox_x3a.dts index fd7a8e6eca..fe26e5af6f 100644 --- a/target/linux/ramips/dts/mt7621_oraybox_x3a.dts +++ b/target/linux/ramips/dts/mt7621_oraybox_x3a.dts @@ -145,7 +145,7 @@ }; &switch0 { - ports { + ports { port@2 { status = "okay"; label = "lan2"; diff --git a/target/linux/ramips/dts/mt7621_zyxel_nwa50ax.dts b/target/linux/ramips/dts/mt7621_zyxel_nwa50ax.dts index 62ba49e797..2cdaa40a1c 100644 --- a/target/linux/ramips/dts/mt7621_zyxel_nwa50ax.dts +++ b/target/linux/ramips/dts/mt7621_zyxel_nwa50ax.dts @@ -49,8 +49,8 @@ }; &state_default { - gpio { - groups = "uart3", "rgmii2"; - function = "gpio"; - }; + gpio { + groups = "uart3", "rgmii2"; + function = "gpio"; + }; }; From e8096de9a2d64f9728ad040cfc55fc55ab6dc793 Mon Sep 17 00:00:00 2001 From: Felix Baumann Date: Wed, 8 Feb 2023 03:48:20 +0100 Subject: [PATCH 38/39] realtek: fix dts whitespace Remove whitespace from otherwise empty lines Signed-off-by: Felix Baumann --- target/linux/realtek/dts-5.10/rtl8393_zyxel_gs1900-48.dts | 4 ++-- target/linux/realtek/dts-5.10/rtl931x.dtsi | 6 +++--- target/linux/realtek/dts-5.15/rtl8393_zyxel_gs1900-48.dts | 4 ++-- target/linux/realtek/dts-5.15/rtl931x.dtsi | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/target/linux/realtek/dts-5.10/rtl8393_zyxel_gs1900-48.dts b/target/linux/realtek/dts-5.10/rtl8393_zyxel_gs1900-48.dts index 48cfae6703..c7ddd8313a 100644 --- a/target/linux/realtek/dts-5.10/rtl8393_zyxel_gs1900-48.dts +++ b/target/linux/realtek/dts-5.10/rtl8393_zyxel_gs1900-48.dts @@ -14,7 +14,7 @@ led-failsafe = &led_sys; led-running = &led_sys; led-upgrade = &led_sys; - }; + }; memory@0 { device_type = "memory"; @@ -149,7 +149,7 @@ regmap = <ðernet0>; #address-cells = <1>; #size-cells = <0>; - + /* External phy RTL8218B #1 */ EXTERNAL_PHY(0) EXTERNAL_PHY(1) diff --git a/target/linux/realtek/dts-5.10/rtl931x.dtsi b/target/linux/realtek/dts-5.10/rtl931x.dtsi index a5166141e6..fd932c8be1 100644 --- a/target/linux/realtek/dts-5.10/rtl931x.dtsi +++ b/target/linux/realtek/dts-5.10/rtl931x.dtsi @@ -5,7 +5,7 @@ / { #address-cells = <1>; #size-cells = <1>; - + compatible = "realtek,rtl838x-soc"; cpus { @@ -28,7 +28,7 @@ device_type = "memory"; reg = <0x0 0x10000000>; }; - + chosen { bootargs = "console=ttyS0,115200"; }; @@ -75,7 +75,7 @@ clocks = <&cpuclock>; }; }; - + soc: soc { compatible = "simple-bus"; #address-cells = <1>; diff --git a/target/linux/realtek/dts-5.15/rtl8393_zyxel_gs1900-48.dts b/target/linux/realtek/dts-5.15/rtl8393_zyxel_gs1900-48.dts index 48cfae6703..c7ddd8313a 100644 --- a/target/linux/realtek/dts-5.15/rtl8393_zyxel_gs1900-48.dts +++ b/target/linux/realtek/dts-5.15/rtl8393_zyxel_gs1900-48.dts @@ -14,7 +14,7 @@ led-failsafe = &led_sys; led-running = &led_sys; led-upgrade = &led_sys; - }; + }; memory@0 { device_type = "memory"; @@ -149,7 +149,7 @@ regmap = <ðernet0>; #address-cells = <1>; #size-cells = <0>; - + /* External phy RTL8218B #1 */ EXTERNAL_PHY(0) EXTERNAL_PHY(1) diff --git a/target/linux/realtek/dts-5.15/rtl931x.dtsi b/target/linux/realtek/dts-5.15/rtl931x.dtsi index e7e7840a22..61599e89b5 100644 --- a/target/linux/realtek/dts-5.15/rtl931x.dtsi +++ b/target/linux/realtek/dts-5.15/rtl931x.dtsi @@ -5,7 +5,7 @@ / { #address-cells = <1>; #size-cells = <1>; - + compatible = "realtek,rtl838x-soc"; cpus { @@ -81,7 +81,7 @@ clocks = <&cpuclock>; }; }; - + soc: soc { compatible = "simple-bus"; #address-cells = <1>; From 1a145ccb0a4fbdd5bafc21e5c320b41a41d96ce4 Mon Sep 17 00:00:00 2001 From: Xu Yiming Date: Sun, 5 Feb 2023 03:17:48 +0800 Subject: [PATCH 39/39] kernel: kmod-fs-ntfs3: fix typo Fix typo that mistaken the description of ntfs3 for fuse. Signed-off-by: Xu Yiming --- package/kernel/linux/modules/fs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index ac2131e04a..19fa9fcfc0 100644 --- a/package/kernel/linux/modules/fs.mk +++ b/package/kernel/linux/modules/fs.mk @@ -535,7 +535,7 @@ define KernelPackage/fs-ntfs3 AUTOLOAD:=$(call AutoLoad,80,ntfs3) endef -define KernelPackage/fuse/description +define KernelPackage/fs-ntfs3/description Kernel module for fully functional NTFS filesystem support. It allows reading as well as writing.