From a7f37b401b9d80600dae74f0f26c6a3f52c1c803 Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Fri, 28 Jun 2024 15:50:57 +0800 Subject: [PATCH 01/15] ramips: remove useless compatible strings from SoC dtsi These removed compatible strings do not exist in the source code nor the dt-binding documents. They are useless. Signed-off-by: Shiji Yang --- target/linux/ramips/dts/mt7620a.dtsi | 20 +++++++------- target/linux/ramips/dts/mt7620n.dtsi | 16 ++++++------ target/linux/ramips/dts/mt7628an.dtsi | 4 +-- target/linux/ramips/dts/rt2880.dtsi | 2 +- target/linux/ramips/dts/rt3050.dtsi | 18 ++++++------- target/linux/ramips/dts/rt3352.dtsi | 26 +++++++++---------- target/linux/ramips/dts/rt3883.dtsi | 20 +++++++------- target/linux/ramips/dts/rt5350.dtsi | 20 +++++++------- ...DT-Add-documentation-for-gpio-ralink.patch | 2 +- 9 files changed, 64 insertions(+), 64 deletions(-) diff --git a/target/linux/ramips/dts/mt7620a.dtsi b/target/linux/ramips/dts/mt7620a.dtsi index 65122304c9..4ba4b48bef 100644 --- a/target/linux/ramips/dts/mt7620a.dtsi +++ b/target/linux/ramips/dts/mt7620a.dtsi @@ -48,7 +48,7 @@ }; timer: timer@100 { - compatible = "ralink,mt7620a-timer", "ralink,rt2880-timer"; + compatible = "ralink,rt2880-timer"; reg = <0x100 0x20>; clocks = <&sysc 5>; @@ -58,7 +58,7 @@ }; watchdog: watchdog@120 { - compatible = "ralink,mt7620a-wdt", "ralink,rt2880-wdt"; + compatible = "ralink,rt2880-wdt"; reg = <0x120 0x10>; clocks = <&sysc 6>; @@ -71,7 +71,7 @@ }; intc: intc@200 { - compatible = "ralink,mt7620a-intc", "ralink,rt2880-intc"; + compatible = "ralink,rt2880-intc"; reg = <0x200 0x100>; interrupt-controller; @@ -106,7 +106,7 @@ }; gpio0: gpio@600 { - compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio"; + compatible = "ralink,rt2880-gpio"; reg = <0x600 0x34>; interrupt-parent = <&intc>; @@ -123,7 +123,7 @@ }; gpio1: gpio@638 { - compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio"; + compatible = "ralink,rt2880-gpio"; reg = <0x638 0x24>; interrupt-parent = <&intc>; @@ -142,7 +142,7 @@ }; gpio2: gpio@660 { - compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio"; + compatible = "ralink,rt2880-gpio"; reg = <0x660 0x24>; interrupt-parent = <&intc>; @@ -161,7 +161,7 @@ }; gpio3: gpio@688 { - compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio"; + compatible = "ralink,rt2880-gpio"; reg = <0x688 0x24>; interrupt-parent = <&intc>; @@ -220,7 +220,7 @@ }; spi0: spi@b00 { - compatible = "ralink,mt7620a-spi", "ralink,rt2880-spi"; + compatible = "ralink,rt2880-spi"; reg = <0xb00 0x40>; clocks = <&sysc 10>; @@ -465,14 +465,14 @@ mediatek,switch = <&gsw>; port@4 { - compatible = "mediatek,mt7620a-gsw-port", "mediatek,eth-port"; + compatible = "mediatek,eth-port"; reg = <4>; status = "disabled"; }; port@5 { - compatible = "mediatek,mt7620a-gsw-port", "mediatek,eth-port"; + compatible = "mediatek,eth-port"; reg = <5>; status = "disabled"; diff --git a/target/linux/ramips/dts/mt7620n.dtsi b/target/linux/ramips/dts/mt7620n.dtsi index 4f07c6bc4b..a844198f66 100644 --- a/target/linux/ramips/dts/mt7620n.dtsi +++ b/target/linux/ramips/dts/mt7620n.dtsi @@ -48,7 +48,7 @@ }; timer: timer@100 { - compatible = "ralink,mt7620a-timer", "ralink,rt2880-timer"; + compatible = "ralink,rt2880-timer"; reg = <0x100 0x20>; clocks = <&sysc 5>; @@ -58,7 +58,7 @@ }; watchdog: watchdog@120 { - compatible = "ralink,mt7620a-wdt", "ralink,rt2880-wdt"; + compatible = "ralink,rt2880-wdt"; reg = <0x120 0x10>; clocks = <&sysc 6>; @@ -71,7 +71,7 @@ }; intc: intc@200 { - compatible = "ralink,mt7620a-intc", "ralink,rt2880-intc"; + compatible = "ralink,rt2880-intc"; reg = <0x200 0x100>; interrupt-controller; @@ -90,7 +90,7 @@ }; gpio0: gpio@600 { - compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio"; + compatible = "ralink,rt2880-gpio"; reg = <0x600 0x34>; interrupt-parent = <&intc>; @@ -107,7 +107,7 @@ }; gpio1: gpio@638 { - compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio"; + compatible = "ralink,rt2880-gpio"; reg = <0x638 0x24>; interrupt-parent = <&intc>; @@ -126,7 +126,7 @@ }; gpio2: gpio@660 { - compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio"; + compatible = "ralink,rt2880-gpio"; reg = <0x660 0x24>; interrupt-parent = <&intc>; @@ -145,7 +145,7 @@ }; gpio3: gpio@688 { - compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio"; + compatible = "ralink,rt2880-gpio"; reg = <0x688 0x24>; interrupt-parent = <&intc>; @@ -182,7 +182,7 @@ }; spi0: spi@b00 { - compatible = "ralink,mt7620a-spi", "ralink,rt2880-spi"; + compatible = "ralink,rt2880-spi"; reg = <0xb00 0x40>; clocks = <&sysc 10>; diff --git a/target/linux/ramips/dts/mt7628an.dtsi b/target/linux/ramips/dts/mt7628an.dtsi index 906ea03fe9..be80c11d11 100644 --- a/target/linux/ramips/dts/mt7628an.dtsi +++ b/target/linux/ramips/dts/mt7628an.dtsi @@ -52,7 +52,7 @@ }; intc: intc@200 { - compatible = "ralink,mt7628an-intc", "ralink,rt2880-intc"; + compatible = "ralink,rt2880-intc"; reg = <0x200 0x100>; interrupt-controller; @@ -418,7 +418,7 @@ }; esw: esw@10110000 { - compatible = "mediatek,mt7628-esw", "ralink,rt3050-esw"; + compatible = "ralink,rt3050-esw"; reg = <0x10110000 0x8000>; resets = <&sysc 24>; diff --git a/target/linux/ramips/dts/rt2880.dtsi b/target/linux/ramips/dts/rt2880.dtsi index 998b49a277..5ac2d2e3b8 100644 --- a/target/linux/ramips/dts/rt2880.dtsi +++ b/target/linux/ramips/dts/rt2880.dtsi @@ -218,7 +218,7 @@ status = "disabled"; port@0 { - compatible = "ralink,rt2880-port", "mediatek,eth-port"; + compatible = "mediatek,eth-port"; reg = <0>; }; diff --git a/target/linux/ramips/dts/rt3050.dtsi b/target/linux/ramips/dts/rt3050.dtsi index 30a3f898cd..80d0f1585b 100644 --- a/target/linux/ramips/dts/rt3050.dtsi +++ b/target/linux/ramips/dts/rt3050.dtsi @@ -47,7 +47,7 @@ }; timer: timer@100 { - compatible = "ralink,rt3050-timer", "ralink,rt2880-timer"; + compatible = "ralink,rt2880-timer"; reg = <0x100 0x20>; clocks = <&sysc 3>; @@ -57,7 +57,7 @@ }; watchdog: watchdog@120 { - compatible = "ralink,rt3050-wdt", "ralink,rt2880-wdt"; + compatible = "ralink,rt2880-wdt"; reg = <0x120 0x10>; clocks = <&sysc 4>; @@ -70,7 +70,7 @@ }; intc: intc@200 { - compatible = "ralink,rt3050-intc", "ralink,rt2880-intc"; + compatible = "ralink,rt2880-intc"; reg = <0x200 0x100>; interrupt-controller; @@ -89,7 +89,7 @@ }; uart: uart@500 { - compatible = "ralink,rt3050-uart", "ralink,rt2880-uart", "ns16550a"; + compatible = "ralink,rt3052-uart", "ralink,rt2880-uart", "ns16550a"; reg = <0x500 0x100>; clocks = <&sysc 5>; @@ -105,7 +105,7 @@ }; gpio0: gpio@600 { - compatible = "ralink,rt3050-gpio", "ralink,rt2880-gpio"; + compatible = "ralink,rt2880-gpio"; reg = <0x600 0x34>; gpio-controller; @@ -122,7 +122,7 @@ }; gpio1: gpio@638 { - compatible = "ralink,rt3050-gpio", "ralink,rt2880-gpio"; + compatible = "ralink,rt2880-gpio"; reg = <0x638 0x24>; gpio-controller; @@ -138,7 +138,7 @@ }; gpio2: gpio@660 { - compatible = "ralink,rt3050-gpio", "ralink,rt2880-gpio"; + compatible = "ralink,rt2880-gpio"; reg = <0x660 0x24>; gpio-controller; @@ -209,7 +209,7 @@ }; spi0: spi@b00 { - compatible = "ralink,rt3050-spi", "ralink,rt2880-spi"; + compatible = "ralink,rt2880-spi"; reg = <0xb00 0x100>; resets = <&sysc 18>; @@ -227,7 +227,7 @@ }; uartlite: uartlite@c00 { - compatible = "ralink,rt3050-uart", "ralink,rt2880-uart", "ns16550a"; + compatible = "ralink,rt3052-uart", "ralink,rt2880-uart", "ns16550a"; reg = <0xc00 0x100>; clocks = <&sysc 10>; diff --git a/target/linux/ramips/dts/rt3352.dtsi b/target/linux/ramips/dts/rt3352.dtsi index b4829cb1b1..0690589e5d 100644 --- a/target/linux/ramips/dts/rt3352.dtsi +++ b/target/linux/ramips/dts/rt3352.dtsi @@ -48,7 +48,7 @@ }; timer: timer@100 { - compatible = "ralink,rt3352-timer", "ralink,rt2880-timer"; + compatible = "ralink,rt2880-timer"; reg = <0x100 0x20>; clocks = <&sysc 4>; @@ -58,7 +58,7 @@ }; watchdog: watchdog@120 { - compatible = "ralink,rt3352-wdt", "ralink,rt2880-wdt"; + compatible = "ralink,rt2880-wdt"; reg = <0x120 0x10>; clocks = <&sysc 5>; @@ -71,7 +71,7 @@ }; intc: intc@200 { - compatible = "ralink,rt3352-intc", "ralink,rt2880-intc"; + compatible = "ralink,rt2880-intc"; reg = <0x200 0x100>; interrupt-controller; @@ -82,7 +82,7 @@ }; memc: memc@300 { - compatible = "ralink,rt3352-memc", "ralink,rt3050-memc"; + compatible = "ralink,rt3050-memc"; reg = <0x300 0x100>; interrupt-parent = <&intc>; @@ -90,7 +90,7 @@ }; uart: uart@500 { - compatible = "ralink,rt3352-uart", "ralink,rt2880-uart", "ns16550a"; + compatible = "ralink,rt3052-uart", "ralink,rt2880-uart", "ns16550a"; reg = <0x500 0x100>; clocks = <&sysc 6>; @@ -106,7 +106,7 @@ }; gpio0: gpio@600 { - compatible = "ralink,rt3352-gpio", "ralink,rt2880-gpio"; + compatible = "ralink,rt2880-gpio"; reg = <0x600 0x34>; gpio-controller; @@ -123,7 +123,7 @@ }; gpio1: gpio@638 { - compatible = "ralink,rt3352-gpio", "ralink,rt2880-gpio"; + compatible = "ralink,rt2880-gpio"; reg = <0x638 0x24>; gpio-controller; @@ -139,7 +139,7 @@ }; gpio2: gpio@660 { - compatible = "ralink,rt3352-gpio", "ralink,rt2880-gpio"; + compatible = "ralink,rt2880-gpio"; reg = <0x660 0x24>; gpio-controller; @@ -195,7 +195,7 @@ }; spi0: spi@b00 { - compatible = "ralink,rt3352-spi", "ralink,rt2880-spi"; + compatible = "ralink,rt2880-spi"; reg = <0xb00 0x40>; #address-cells = <1>; #size-cells = <0>; @@ -212,7 +212,7 @@ }; spi1: spi@b40 { - compatible = "ralink,rt3352-spi", "ralink,rt2880-spi"; + compatible = "ralink,rt2880-spi"; reg = <0xb40 0x60>; #address-cells = <1>; #size-cells = <0>; @@ -227,7 +227,7 @@ }; uartlite: uartlite@c00 { - compatible = "ralink,rt3352-uart", "ralink,rt2880-uart", "ns16550a"; + compatible = "ralink,rt3052-uart", "ralink,rt2880-uart", "ns16550a"; reg = <0xc00 0x100>; clocks = <&sysc 11>; @@ -314,7 +314,7 @@ }; ethernet: ethernet@10100000 { - compatible = "ralink,rt3352-eth", "ralink,rt3050-eth"; + compatible = "ralink,rt3050-eth"; reg = <0x10100000 0x10000>; clocks = <&sysc 12>; @@ -329,7 +329,7 @@ }; esw: esw@10110000 { - compatible = "ralink,rt3352-esw", "ralink,rt3050-esw"; + compatible = "ralink,rt3050-esw"; reg = <0x10110000 0x8000>; resets = <&sysc 24>; diff --git a/target/linux/ramips/dts/rt3883.dtsi b/target/linux/ramips/dts/rt3883.dtsi index 8c76eb6631..d2557d4559 100644 --- a/target/linux/ramips/dts/rt3883.dtsi +++ b/target/linux/ramips/dts/rt3883.dtsi @@ -48,7 +48,7 @@ }; timer: timer@100 { - compatible = "ralink,rt3883-timer", "ralink,rt2880-timer"; + compatible = "ralink,rt2880-timer"; reg = <0x100 0x20>; clocks = <&sysc 3>; @@ -58,7 +58,7 @@ }; watchdog: watchdog@120 { - compatible = "ralink,rt3883-wdt", "ralink,rt2880-wdt"; + compatible = "ralink,rt2880-wdt"; reg = <0x120 0x10>; clocks = <&sysc 4>; @@ -71,7 +71,7 @@ }; intc: intc@200 { - compatible = "ralink,rt3883-intc", "ralink,rt2880-intc"; + compatible = "ralink,rt2880-intc"; reg = <0x200 0x100>; interrupt-controller; @@ -106,7 +106,7 @@ }; gpio0: gpio@600 { - compatible = "ralink,rt3883-gpio", "ralink,rt2880-gpio"; + compatible = "ralink,rt2880-gpio"; reg = <0x600 0x34>; interrupt-parent = <&intc>; @@ -123,7 +123,7 @@ }; gpio1: gpio@638 { - compatible = "ralink,rt3883-gpio", "ralink,rt2880-gpio"; + compatible = "ralink,rt2880-gpio"; reg = <0x638 0x24>; gpio-controller; @@ -139,7 +139,7 @@ }; gpio2: gpio@660 { - compatible = "ralink,rt3883-gpio", "ralink,rt2880-gpio"; + compatible = "ralink,rt2880-gpio"; reg = <0x660 0x24>; gpio-controller; @@ -155,7 +155,7 @@ }; gpio3: gpio@688 { - compatible = "ralink,rt3883-gpio", "ralink,rt2880-gpio"; + compatible = "ralink,rt2880-gpio"; reg = <0x688 0x24>; gpio-controller; @@ -211,7 +211,7 @@ }; spi0: spi@b00 { - compatible = "ralink,rt3883-spi", "ralink,rt2880-spi"; + compatible = "ralink,rt2880-spi"; reg = <0xb00 0x40>; #address-cells = <1>; #size-cells = <0>; @@ -228,7 +228,7 @@ }; spi1: spi@b40 { - compatible = "ralink,rt3883-spi", "ralink,rt2880-spi"; + compatible = "ralink,rt2880-spi"; reg = <0xb40 0x60>; #address-cells = <1>; #size-cells = <0>; @@ -339,7 +339,7 @@ interrupts = <5>; port@0 { - compatible = "ralink,rt3883-port", "mediatek,eth-port"; + compatible = "mediatek,eth-port"; reg = <0>; }; diff --git a/target/linux/ramips/dts/rt5350.dtsi b/target/linux/ramips/dts/rt5350.dtsi index 30f6435842..6b54291800 100644 --- a/target/linux/ramips/dts/rt5350.dtsi +++ b/target/linux/ramips/dts/rt5350.dtsi @@ -48,7 +48,7 @@ }; timer: timer@100 { - compatible = "ralink,rt5350-timer", "ralink,rt2880-timer"; + compatible = "ralink,rt2880-timer"; reg = <0x100 0x20>; clocks = <&sysc 4>; @@ -58,7 +58,7 @@ }; watchdog: watchdog@120 { - compatible = "ralink,rt5350-wdt", "ralink,rt2880-wdt"; + compatible = "ralink,rt2880-wdt"; reg = <0x120 0x10>; clocks = <&sysc 5>; @@ -71,7 +71,7 @@ }; intc: intc@200 { - compatible = "ralink,rt5350-intc", "ralink,rt2880-intc"; + compatible = "ralink,rt2880-intc"; reg = <0x200 0x100>; interrupt-controller; @@ -90,7 +90,7 @@ }; uart: uart@500 { - compatible = "ralink,rt5350-uart", "ralink,rt2880-uart", "ns16550a"; + compatible = "ralink,rt3052-uart", "ralink,rt2880-uart", "ns16550a"; reg = <0x500 0x100>; clocks = <&sysc 6>; @@ -106,7 +106,7 @@ }; gpio0: gpio@600 { - compatible = "ralink,rt5350-gpio", "ralink,rt2880-gpio"; + compatible = "ralink,rt2880-gpio"; reg = <0x600 0x34>; interrupt-parent = <&intc>; @@ -123,7 +123,7 @@ }; gpio1: gpio@660 { - compatible = "ralink,rt5350-gpio", "ralink,rt2880-gpio"; + compatible = "ralink,rt2880-gpio"; reg = <0x660 0x24>; interrupt-parent = <&intc>; @@ -182,7 +182,7 @@ }; spi0: spi@b00 { - compatible = "ralink,rt5350-spi", "ralink,rt2880-spi"; + compatible = "ralink,rt2880-spi"; reg = <0xb00 0x40>; clocks = <&sysc 9>; @@ -200,7 +200,7 @@ }; spi1: spi@b40 { - compatible = "ralink,rt5350-spi", "ralink,rt2880-spi"; + compatible = "ralink,rt2880-spi"; reg = <0xb40 0x60>; clocks = <&sysc 10>; @@ -218,7 +218,7 @@ }; uartlite: uartlite@c00 { - compatible = "ralink,rt5350-uart", "ralink,rt2880-uart", "ns16550a"; + compatible = "ralink,rt3052-uart", "ralink,rt2880-uart", "ns16550a"; reg = <0xc00 0x100>; clocks = <&sysc 11>; @@ -350,7 +350,7 @@ }; esw: esw@10110000 { - compatible = "ralink,rt5350-esw", "ralink,rt3050-esw"; + compatible = "ralink,rt3050-esw"; reg = <0x10110000 0x8000>; resets = <&sysc 24>; diff --git a/target/linux/ramips/patches-6.6/801-DT-Add-documentation-for-gpio-ralink.patch b/target/linux/ramips/patches-6.6/801-DT-Add-documentation-for-gpio-ralink.patch index 93dabf8776..976029c18c 100644 --- a/target/linux/ramips/patches-6.6/801-DT-Add-documentation-for-gpio-ralink.patch +++ b/target/linux/ramips/patches-6.6/801-DT-Add-documentation-for-gpio-ralink.patch @@ -40,7 +40,7 @@ Cc: linux-gpio@vger.kernel.org +Example: + + gpio0: gpio@600 { -+ compatible = "ralink,rt5350-gpio", "ralink,rt2880-gpio"; ++ compatible = "ralink,rt2880-gpio"; + + #gpio-cells = <2>; + gpio-controller; From a787ebf7165c461be2a1c940198e9643f05f5d40 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 1 Jul 2024 16:48:45 -0700 Subject: [PATCH 02/15] tools/util-linux: build libuuid as PIC Needed to fix users of libuuid.a as autoconf applies PIC to only shared libraries by default. Found when trying to build python3/host. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/15852 Signed-off-by: Robert Marko --- tools/util-linux/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/util-linux/Makefile b/tools/util-linux/Makefile index a3a6c2be41..b4cc45efc8 100644 --- a/tools/util-linux/Makefile +++ b/tools/util-linux/Makefile @@ -21,6 +21,7 @@ HOST_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/host-build.mk HOST_CONFIGURE_ARGS += \ + --with-pic \ --disable-shared \ --disable-all-programs \ --enable-hexdump \ From fd085a737b9c2158e4086954f316494eebcb4ae1 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Tue, 2 Jul 2024 11:14:17 +0200 Subject: [PATCH 03/15] tools/e2fsprogs: fixup STAGING_DIR_HOST path evaluation in shell scripts We have to use curly braces on the exported STAGING_DIR_HOST env variable, instead of evaluating it directly as we are not in Make but a separate shell script. Otherwise it would fail with: staging_dir/host/bin/compile_et: line 6: STAGING_DIR_HOST: command not found staging_dir/host/bin/mk_cmds: line 5: STAGING_DIR_HOST: command not found And so when krb5 tries to build it will fail as compile_et and mk_cmds will return an error. Fixes: 55bda9863dd0 ("tools/e2fsprogs: fix shell scripts under SDK") Link: https://github.com/openwrt/openwrt/pull/15854 Signed-off-by: Robert Marko --- tools/e2fsprogs/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile index cb59f4d9ec..2c35adfa8f 100644 --- a/tools/e2fsprogs/Makefile +++ b/tools/e2fsprogs/Makefile @@ -39,8 +39,8 @@ endef define Host/Install $(call Host/Install/Default) - $(SED) 's|^DIR=.*|DIR=$$$$(STAGING_DIR_HOST)/share/et|' $(STAGING_DIR_HOST)/bin/compile_et - $(SED) 's|^DIR=.*|DIR=$$$$(STAGING_DIR_HOST)/share/ss|' $(STAGING_DIR_HOST)/bin/mk_cmds + $(SED) 's|^DIR=.*|DIR=$$$${STAGING_DIR_HOST}/share/et|' $(STAGING_DIR_HOST)/bin/compile_et + $(SED) 's|^DIR=.*|DIR=$$$${STAGING_DIR_HOST}/share/ss|' $(STAGING_DIR_HOST)/bin/mk_cmds endef define Host/Uninstall From 6b16eaf8407c364744487dae3b8d5dc12a5cfdd4 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Wed, 3 Jul 2024 01:40:15 +0300 Subject: [PATCH 04/15] wifi-scripts: add missing dependency on ucode-mod-uci Fixes the following error: Syntax error: Unable to resolve path for module 'uci' In line 3, byte 27: `import * as uci from 'uci';` Near here ----------------^ Fixes: 4a3ed518b2d0 ("wifi-scripts: rewrite wifi detect code in ucode") Signed-off-by: Stijn Tintel --- package/network/config/wifi-scripts/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network/config/wifi-scripts/Makefile b/package/network/config/wifi-scripts/Makefile index 085860d7c6..8074f90105 100644 --- a/package/network/config/wifi-scripts/Makefile +++ b/package/network/config/wifi-scripts/Makefile @@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/package.mk define Package/wifi-scripts SECTION:=utils CATEGORY:=Base system - DEPENDS:=+netifd +ucode +ucode-mod-nl80211 +ucode-mod-ubus + DEPENDS:=+netifd +ucode +ucode-mod-nl80211 +ucode-mod-ubus +ucode-mod-uci TITLE:=Wi-Fi configuration scripts PKGARCH:=all endef From c27fd6fd97d06c0630c67ef1f57d2eaf4dafa09f Mon Sep 17 00:00:00 2001 From: Sean Khan Date: Mon, 1 Jul 2024 13:59:45 -0400 Subject: [PATCH 05/15] f2fs-tools: Add missing 'f2fslabel' symlink `f2fslabel` is already built into `f2fs.fsck`, but is missing its symlink in the final package. Signed-off-by: Sean Khan Link: https://github.com/openwrt/openwrt/pull/15851 Signed-off-by: Robert Marko --- package/utils/f2fs-tools/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/utils/f2fs-tools/Makefile b/package/utils/f2fs-tools/Makefile index d5dc1a6d78..d11e89d8e3 100644 --- a/package/utils/f2fs-tools/Makefile +++ b/package/utils/f2fs-tools/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=f2fs-tools PKG_VERSION:=1.16.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/ @@ -137,6 +137,7 @@ define Package/f2fsck/install $(LN) ../sbin/fsck.f2fs $(1)/usr/sbin/dump.f2fs $(LN) ../sbin/fsck.f2fs $(1)/usr/sbin/sload.f2fs $(LN) ../sbin/fsck.f2fs $(1)/usr/sbin/resize.f2fs + $(LN) ../sbin/fsck.f2fs $(1)/usr/sbin/f2fslabel endef Package/f2fsck-selinux/install = $(Package/f2fsck/install) From d55083fbcaea9cdd2ebc10a2d38989ad485a5357 Mon Sep 17 00:00:00 2001 From: Lu jicong Date: Tue, 2 Jul 2024 21:01:49 +0800 Subject: [PATCH 06/15] target.mk: fix arm architecture level detection Now kernel configs of armv6k CPUs don't include CONFIG_CPU_V6. So armv6k CPUs cannot be detected as arm_v6. Fix this by adding detection for CONFIG_CPU_V6K. Signed-off-by: Lu jicong Link: https://github.com/openwrt/openwrt/pull/15855 Signed-off-by: Christian Marangi --- include/target.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/target.mk b/include/target.mk index 386abf2ef1..c9ff3cbb7c 100644 --- a/include/target.mk +++ b/include/target.mk @@ -346,7 +346,15 @@ ifeq ($(DUMP),1) ifneq ($(CONFIG_CPU_MIPS32_R2),) FEATURES += mips16 endif - FEATURES += $(foreach v,6 7,$(if $(CONFIG_CPU_V$(v)),arm_v$(v))) + ifneq ($(CONFIG_CPU_V6),) + FEATURES += arm_v6 + endif + ifneq ($(CONFIG_CPU_V6K),) + FEATURES += arm_v6 + endif + ifneq ($(CONFIG_CPU_V7),) + FEATURES += arm_v7 + endif # remove duplicates FEATURES:=$(sort $(FEATURES)) From a1440747f2edb507c819f63f93228cd16c1cdcb5 Mon Sep 17 00:00:00 2001 From: Michael Pratt Date: Wed, 3 Jul 2024 03:15:46 -0400 Subject: [PATCH 07/15] build: fix missing SOURCE_VERSION variable The recipe Download/git-kernel uses DownloadMethod/git which now requires a definition of SOURCE_VERSION instead of VERSION due to Validate/git being used to check for the variables. Rename the variable as intended to match with the others that were renamed in the referenced commit. This fixes the following Makefile parse error when downloading a specific kernel repository version when configured with the CONFIG_KERNEL_GIT_CLONE_URI option: Makefile:19: *** Download/git-kernel is missing the SOURCE_VERSION field.. Stop. Fixes: 9fc79e2e2 ("download: don't overwrite VERSION variable") Signed-off-by: Michael Pratt Link: https://github.com/openwrt/openwrt/pull/15858 Signed-off-by: Christian Marangi --- include/kernel-build.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/kernel-build.mk b/include/kernel-build.mk index c42dae0049..48e00fa4c6 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -51,7 +51,7 @@ endif define Download/git-kernel URL:=$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)) PROTO:=git - VERSION:=$(CONFIG_KERNEL_GIT_REF) + SOURCE_VERSION:=$(CONFIG_KERNEL_GIT_REF) FILE:=$(LINUX_SOURCE) SUBDIR:=linux-$(LINUX_VERSION) OPTS:=$(KERNEL_GIT_OPTS) From b0953c4fbf1bb0ad0844febe991636d05884c194 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 29 Jun 2024 17:24:09 +0200 Subject: [PATCH 08/15] kernel: Extract kmod-nf-dup-inet The nf_dup_ipv4.ko and nf_dup_ipv6.ko kernel module were packaged by kmod-ipt-tee and kmod-nft-dup-inet at the same time. Extract them into a separate package used by both. Signed-off-by: Hauke Mehrtens Link: https://github.com/openwrt/openwrt/pull/15833 Signed-off-by: Christian Marangi --- include/netfilter.mk | 2 -- package/kernel/linux/modules/netfilter.mk | 26 +++++++++++++++++------ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/include/netfilter.mk b/include/netfilter.mk index 81488fe5c8..7d1f03891b 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -253,8 +253,6 @@ $(eval $(call nf_add,IPT_LED,CONFIG_NETFILTER_XT_TARGET_LED, $(P_XT)xt_LED)) # tee $(eval $(call nf_add,IPT_TEE,CONFIG_NETFILTER_XT_TARGET_TEE, $(P_XT)xt_TEE)) -$(eval $(if $(NF_KMOD),$(call nf_add,IPT_TEE,CONFIG_NF_DUP_IPV4, $(P_V4)nf_dup_ipv4),)) -$(eval $(if $(NF_KMOD),$(call nf_add,IPT_TEE,CONFIG_NF_DUP_IPV6, $(P_V6)nf_dup_ipv6),)) # u32 diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk index 76697f5d2f..8bf2be585f 100644 --- a/package/kernel/linux/modules/netfilter.mk +++ b/package/kernel/linux/modules/netfilter.mk @@ -132,6 +132,22 @@ endef $(eval $(call KernelPackage,nf-conntrack6)) +define KernelPackage/nf-dup-inet + SUBMENU:=$(NF_MENU) + TITLE:=Netfilter nf_tables dup in ip/ip6/inet family support + HIDDEN:=1 + DEPENDS:=+kmod-nf-conntrack +IPV6:kmod-nf-conntrack6 + KCONFIG:= \ + CONFIG_NF_DUP_IPV4 \ + CONFIG_NF_DUP_IPV6 + FILES:= \ + $(LINUX_DIR)/net/ipv4/netfilter/nf_dup_ipv4.ko \ + $(LINUX_DIR)/net/ipv6/netfilter/nf_dup_ipv6.ko +endef + +$(eval $(call KernelPackage,nf-dup-inet)) + + define KernelPackage/nf-log SUBMENU:=$(NF_MENU) TITLE:=Netfilter Logging @@ -716,7 +732,7 @@ $(eval $(call KernelPackage,ipt-tproxy)) define KernelPackage/ipt-tee TITLE:=TEE support - DEPENDS:=+kmod-ipt-conntrack + DEPENDS:=+kmod-ipt-conntrack +kmod-nf-dup-inet KCONFIG:=$(KCONFIG_IPT_TEE) FILES:=$(foreach mod,$(IPT_TEE-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoProbe,$(notdir nf_tee $(IPT_TEE-m))) @@ -1150,18 +1166,14 @@ $(eval $(call KernelPackage,nft-bridge)) define KernelPackage/nft-dup-inet SUBMENU:=$(NF_MENU) TITLE:=Netfilter nf_tables dup in ip/ip6/inet family support - DEPENDS:=+kmod-nft-core +kmod-nf-conntrack +IPV6:kmod-nf-conntrack6 + DEPENDS:=+kmod-nft-core +kmod-nf-dup-inet KCONFIG:= \ - CONFIG_NF_DUP_IPV4 \ - CONFIG_NF_DUP_IPV6 \ CONFIG_NFT_DUP_IPV4 \ CONFIG_NFT_DUP_IPV6 FILES:= \ - $(LINUX_DIR)/net/ipv4/netfilter/nf_dup_ipv4.ko \ - $(LINUX_DIR)/net/ipv6/netfilter/nf_dup_ipv6.ko \ $(LINUX_DIR)/net/ipv4/netfilter/nft_dup_ipv4.ko \ $(LINUX_DIR)/net/ipv6/netfilter/nft_dup_ipv6.ko - AUTOLOAD:=$(call AutoProbe,nf_dup_ipv4 nf_dup_ipv6 nft_dup_ipv4 nft_dup_ipv6) + AUTOLOAD:=$(call AutoProbe,nft_dup_ipv4 nft_dup_ipv6) endef $(eval $(call KernelPackage,nft-dup-inet)) From fac507606d75eec04762013582273468eea7ed92 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 29 Jun 2024 17:54:49 +0200 Subject: [PATCH 09/15] kernel: Fix kmod-lib-lz4 packaging The kernel provides two variants of the lz4 compression a normal version and a high compression mode version. The old kmod-lib-lz4 package contained the normal version plus one part of the lz4hc version. There was already code which selected the kmod-lib-lz4hc package which did not exists. I split this into 3 packages. kmod-lib-lz4 and kmod-lib-lz4hc for the normal the and high compression algorithm which contain the specific code and the kmod-lib-lz4-decompress which contains the common decompressor. New we are also packaging lz4hc.ko Signed-off-by: Hauke Mehrtens Link: https://github.com/openwrt/openwrt/pull/15833 Signed-off-by: Christian Marangi --- package/kernel/linux/modules/lib.mk | 43 +++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/package/kernel/linux/modules/lib.mk b/package/kernel/linux/modules/lib.mk index 8d67a3187a..820c569741 100644 --- a/package/kernel/linux/modules/lib.mk +++ b/package/kernel/linux/modules/lib.mk @@ -147,21 +147,28 @@ endef $(eval $(call KernelPackage,lib-zstd)) +define KernelPackage/lib-lz4-decompress + SUBMENU:=$(LIB_MENU) + TITLE:=LZ4 decompress + HIDDEN:=1 + KCONFIG:=CONFIG_LZ4_DECOMPRESS + FILES:=$(LINUX_DIR)/lib/lz4/lz4_decompress.ko +endef + +$(eval $(call KernelPackage,lib-lz4-decompress)) + + define KernelPackage/lib-lz4 SUBMENU:=$(LIB_MENU) TITLE:=LZ4 support - DEPENDS:=+kmod-crypto-acompress + DEPENDS:=+kmod-crypto-acompress +kmod-lib-lz4-decompress KCONFIG:= \ CONFIG_CRYPTO_LZ4 \ - CONFIG_CRYPTO_LZ4HC \ - CONFIG_LZ4_COMPRESS \ - CONFIG_LZ4_DECOMPRESS + CONFIG_LZ4_COMPRESS FILES:= \ $(LINUX_DIR)/crypto/lz4.ko \ - $(LINUX_DIR)/lib/lz4/lz4_compress.ko \ - $(LINUX_DIR)/lib/lz4/lz4hc_compress.ko \ - $(LINUX_DIR)/lib/lz4/lz4_decompress.ko - AUTOLOAD:=$(call AutoProbe,lz4 lz4_compress lz4hc_compress lz4_decompress) + $(LINUX_DIR)/lib/lz4/lz4_compress.ko + AUTOLOAD:=$(call AutoProbe,lz4 lz4_compress) endef define KernelPackage/lib-lz4/description @@ -171,6 +178,26 @@ endef $(eval $(call KernelPackage,lib-lz4)) +define KernelPackage/lib-lz4hc + SUBMENU:=$(LIB_MENU) + TITLE:=LZ4HC support + DEPENDS:=+kmod-crypto-acompress +kmod-lib-lz4-decompress + KCONFIG:= \ + CONFIG_CRYPTO_LZ4HC \ + CONFIG_LZ4HC_COMPRESS + FILES:= \ + $(LINUX_DIR)/crypto/lz4hc.ko \ + $(LINUX_DIR)/lib/lz4/lz4hc_compress.ko + AUTOLOAD:=$(call AutoProbe,lz4hc lz4hc_compress) +endef + +define KernelPackage/lib-lz4hc/description + Kernel module for LZ4HC compression/decompression support +endef + +$(eval $(call KernelPackage,lib-lz4hc)) + + define KernelPackage/lib-842 SUBMENU:=$(LIB_MENU) TITLE:=842 support From f89091bba6be483e66c5ac14c477621f74aef203 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 29 Jun 2024 17:38:46 +0200 Subject: [PATCH 10/15] kernel: Add kmod-crypto-blake2b The kmod-fs-btrfs package has a soft dependency to kmod-crypto-blake2b The CONFIG_BTRFS_FS kernel build option selects CONFIG_CRYPTO_BLAKE2B, but we did not package it before. Signed-off-by: Hauke Mehrtens Link: https://github.com/openwrt/openwrt/pull/15833 Signed-off-by: Christian Marangi --- package/kernel/linux/modules/crypto.mk | 12 ++++++++++++ package/kernel/linux/modules/fs.mk | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 5f5bb62986..c2f8bf716d 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -81,6 +81,18 @@ endef $(eval $(call KernelPackage,crypto-authenc)) +define KernelPackage/crypto-blake2b + TITLE:=Support for BLAKE2b cryptographic hash function (RFC 7693) + DEPENDS:=+kmod-crypto-hash + KCONFIG:=CONFIG_CRYPTO_BLAKE2B + FILES:=$(LINUX_DIR)/crypto/blake2b_generic.ko + AUTOLOAD:=$(call AutoLoad,09,blake2b_generic) + $(call AddDepends/crypto) +endef + +$(eval $(call KernelPackage,crypto-blake2b)) + + define KernelPackage/crypto-cbc TITLE:=Cipher Block Chaining CryptoAPI module DEPENDS:=+kmod-crypto-manager diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index 0d98c5a681..82d1cd6f78 100644 --- a/package/kernel/linux/modules/fs.mk +++ b/package/kernel/linux/modules/fs.mk @@ -67,7 +67,7 @@ $(eval $(call KernelPackage,fs-autofs4)) define KernelPackage/fs-btrfs SUBMENU:=$(FS_MENU) TITLE:=BTRFS filesystem support - DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +kmod-lib-raid6 +kmod-lib-xor +kmod-lib-zstd + DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +kmod-lib-raid6 +kmod-lib-xor +kmod-lib-zstd +kmod-crypto-blake2b KCONFIG:=\ CONFIG_BTRFS_FS \ CONFIG_BTRFS_FS_CHECK_INTEGRITY=n From 2ebeda029490e308cc0e8f475e63280f960e74c4 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 29 Jun 2024 18:14:47 +0200 Subject: [PATCH 11/15] kernel: Add kmod-crypto-xxhash kxxhash_generic.ko is a soft dependency of kmod-fs-btrfs, but we did not package it. Extract the kmod-lib-xxhash and then package xxhash_generic.ko. Signed-off-by: Hauke Mehrtens Link: https://github.com/openwrt/openwrt/pull/15833 Signed-off-by: Christian Marangi --- package/kernel/linux/modules/crypto.mk | 12 ++++++++++++ package/kernel/linux/modules/fs.mk | 2 +- package/kernel/linux/modules/lib.mk | 19 ++++++++++++++----- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index c2f8bf716d..43330bf064 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -1170,3 +1170,15 @@ endef $(eval $(call KernelPackage,crypto-xts)) + +define KernelPackage/crypto-xxhash + TITLE:=xxHash non-cryptographic hash algorithm + DEPENDS:=+kmod-crypto-hash +kmod-lib-xxhash + KCONFIG:=CONFIG_CRYPTO_XXHASH + FILES:=$(LINUX_DIR)/crypto/xxhash_generic.ko + AUTOLOAD:=$(call AutoLoad,09,xxhash_generic) + $(call AddDepends/crypto) +endef + +$(eval $(call KernelPackage,crypto-xxhash)) + diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index 82d1cd6f78..bc55dbd967 100644 --- a/package/kernel/linux/modules/fs.mk +++ b/package/kernel/linux/modules/fs.mk @@ -67,7 +67,7 @@ $(eval $(call KernelPackage,fs-autofs4)) define KernelPackage/fs-btrfs SUBMENU:=$(FS_MENU) TITLE:=BTRFS filesystem support - DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +kmod-lib-raid6 +kmod-lib-xor +kmod-lib-zstd +kmod-crypto-blake2b + DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +kmod-lib-raid6 +kmod-lib-xor +kmod-lib-zstd +kmod-crypto-blake2b +kmod-crypto-xxhash KCONFIG:=\ CONFIG_BTRFS_FS \ CONFIG_BTRFS_FS_CHECK_INTEGRITY=n diff --git a/package/kernel/linux/modules/lib.mk b/package/kernel/linux/modules/lib.mk index 820c569741..ea4f034b99 100644 --- a/package/kernel/linux/modules/lib.mk +++ b/package/kernel/linux/modules/lib.mk @@ -122,22 +122,31 @@ endef $(eval $(call KernelPackage,lib-lzo)) +define KernelPackage/lib-xxhash + SUBMENU:=$(LIB_MENU) + TITLE:=xxhash support + HIDDEN:=1 + KCONFIG:=CONFIG_XXHASH + FILES:=$(LINUX_DIR)/lib/xxhash.ko +endef + +$(eval $(call KernelPackage,lib-xxhash)) + + define KernelPackage/lib-zstd SUBMENU:=$(LIB_MENU) TITLE:=ZSTD support - DEPENDS:=+kmod-crypto-acompress + DEPENDS:=+kmod-crypto-acompress +kmod-lib-xxhash KCONFIG:= \ CONFIG_CRYPTO_ZSTD \ CONFIG_ZSTD_COMPRESS \ - CONFIG_ZSTD_DECOMPRESS \ - CONFIG_XXHASH + CONFIG_ZSTD_DECOMPRESS FILES:= \ $(LINUX_DIR)/crypto/zstd.ko \ - $(LINUX_DIR)/lib/xxhash.ko \ $(LINUX_DIR)/lib/zstd/zstd_common.ko@ge6.1 \ $(LINUX_DIR)/lib/zstd/zstd_compress.ko \ $(LINUX_DIR)/lib/zstd/zstd_decompress.ko - AUTOLOAD:=$(call AutoProbe,xxhash zstd zstd_compress zstd_decompress) + AUTOLOAD:=$(call AutoProbe,zstd zstd_compress zstd_decompress) endef define KernelPackage/lib-zstd/description From 4e334279653a7a53a3dafdd4236d61d053a91973 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 29 Jun 2024 18:01:56 +0200 Subject: [PATCH 12/15] kernel: Add mtd_nandbiterrs.ko to kmod-mtdtests The mtd_nandbiterrs.ko kernel module was added with kernel 3.7. We should package it like the other test modules. Signed-off-by: Hauke Mehrtens Link: https://github.com/openwrt/openwrt/pull/15833 Signed-off-by: Christian Marangi --- package/kernel/linux/modules/other.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 36a8ef46d0..8a50546646 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -577,6 +577,7 @@ define KernelPackage/mtdtests TITLE:=MTD subsystem tests KCONFIG:=CONFIG_MTD_TESTS FILES:=\ + $(LINUX_DIR)/drivers/mtd/tests/mtd_nandbiterrs.ko \ $(LINUX_DIR)/drivers/mtd/tests/mtd_nandecctest.ko \ $(LINUX_DIR)/drivers/mtd/tests/mtd_oobtest.ko \ $(LINUX_DIR)/drivers/mtd/tests/mtd_pagetest.ko \ From 8b4fd1c0dece936dc2c79f2a17d824512e7e7df3 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 29 Jun 2024 18:23:13 +0200 Subject: [PATCH 13/15] kernel: Add kmod-mfd Package the mfd-core.ko kernel module. It is selected by the kmod-hwmon-gsc already. Signed-off-by: Hauke Mehrtens Link: https://github.com/openwrt/openwrt/pull/15833 Signed-off-by: Christian Marangi --- package/kernel/linux/modules/hwmon.mk | 2 +- package/kernel/linux/modules/other.mk | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/kernel/linux/modules/hwmon.mk b/package/kernel/linux/modules/hwmon.mk index cb77eed22e..9a329bc6bc 100644 --- a/package/kernel/linux/modules/hwmon.mk +++ b/package/kernel/linux/modules/hwmon.mk @@ -148,7 +148,7 @@ define KernelPackage/hwmon-gsc $(LINUX_DIR)/drivers/mfd/gateworks-gsc.ko \ $(LINUX_DIR)/drivers/hwmon/gsc-hwmon.ko AUTOLOAD:=$(call AutoLoad,20,gsc-hwmon,1) - $(call AddDepends/hwmon,+kmod-i2c-core) + $(call AddDepends/hwmon,+kmod-i2c-core +kmod-mfd) endef define KernelPackage/hwmon-gsc/description diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 8a50546646..f6f5ecc075 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -572,6 +572,18 @@ endef $(eval $(call KernelPackage,bcma)) +define KernelPackage/mfd + SUBMENU:=$(OTHER_MENU) + TITLE:=Multifunction device drivers + HIDDEN:=1 + KCONFIG:=CONFIG_MFD_CORE + FILES:=$(LINUX_DIR)/drivers/mfd/mfd-core.ko + AUTOLOAD:=$(call AutoLoad,10,mfd-core) +endef + +$(eval $(call KernelPackage,mfd)) + + define KernelPackage/mtdtests SUBMENU:=$(OTHER_MENU) TITLE:=MTD subsystem tests From 4cc69a65420fd6c8f9af7e39b4d80694ea679a4d Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 29 Jun 2024 18:28:40 +0200 Subject: [PATCH 14/15] kernel: Add kmod-sctp-diag Package the sctp_diag.ko file which already gets build when kmod-sctp and kmod-inet-diag are selected. Signed-off-by: Hauke Mehrtens Link: https://github.com/openwrt/openwrt/pull/15833 Signed-off-by: Christian Marangi --- package/kernel/linux/modules/netsupport.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index e56defad38..00dfb98d79 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -1245,6 +1245,18 @@ endef $(eval $(call KernelPackage,sctp)) +define KernelPackage/sctp-diag + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=SCTP diag support + DEPENDS:=+kmod-sctp +kmod-inet-diag + KCONFIG:=CONFIG_INET_SCTP_DIAG + FILES:= $(LINUX_DIR)/net/sctp/sctp_diag.ko + AUTOLOAD:= $(call AutoLoad,33,sctp_diag) +endef + +$(eval $(call KernelPackage,sctp-diag)) + + define KernelPackage/netem SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Network emulation functionality From 37636a8752ecdc0ab399c3f38979c6cfb5576bc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Wed, 3 Jul 2024 20:56:56 +0200 Subject: [PATCH 15/15] bcm27xx: base-files: diag: improve LEDs behaviour MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As reported in https://github.com/openwrt/openwrt/issues/15834 using the PWR LED for indicating diag status is confusing since this is usually used for power supply failures on RPi devices. This commit uses ACT LED for diag status and restores it to mmc activity. Signed-off-by: Álvaro Fernández Rojas --- target/linux/bcm27xx/base-files/etc/diag.sh | 26 +++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/target/linux/bcm27xx/base-files/etc/diag.sh b/target/linux/bcm27xx/base-files/etc/diag.sh index 601448fbe3..c0c8e7f2cf 100644 --- a/target/linux/bcm27xx/base-files/etc/diag.sh +++ b/target/linux/bcm27xx/base-files/etc/diag.sh @@ -5,11 +5,23 @@ . /lib/functions.sh . /lib/functions/leds.sh +status_led_restore_trigger() { + local led_lc=$(echo "$status_led" | awk '{print tolower($0)}') + local led_path="/proc/device-tree/leds/led-$led_lc" + local led_trigger + + [ -d "$led_path" ] && \ + led_trigger=$(cat "$led_path/linux,default-trigger" 2>/dev/null) + + [ -n "$led_trigger" ] && \ + led_set_attr $status_led "trigger" "$led_trigger" +} + set_state() { - if [ -d "/sys/class/leds/PWR" ]; then - status_led="PWR" - else + if [ -d "/sys/class/leds/ACT" ]; then status_led="ACT" + else + return fi case "$1" in @@ -22,11 +34,11 @@ set_state() { preinit_regular) status_led_blink_preinit_regular ;; - upgrade) - status_led_blink_preinit_regular - ;; + upgrade) + status_led_blink_preinit_regular + ;; done) - status_led_on + status_led_restore_trigger ;; esac }