From de217295787ecbc7dbba50ac889b99eb1681cf65 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 1 Mar 2022 23:40:25 +0100 Subject: [PATCH] Update to latest Linux LTS kernel 5.15.25 (#1774) * Linux: Update kernel 5.15.25 Use highest available kernel version in Buildroot 2021.08 (5.13) * Update Hardkernel patches to Linux 5.15 * Update generic-x86-64/ova kernel config/patches for 5.15 * Drop Intel e1000e Sourceforge driver The driver has been discontinued sometime last year. The main reason the out-of-tree kernel has been enabled was for support for the i219-V network chips which meanwhile are supported in mainline. --- Documentation/kernel.md | 14 ++-- buildroot-external/Config.in | 1 - ...add-i2c3-rtc-nodes-and-rtc-aliases-t.patch | 53 ------------- ...meson-g12b-add-power-button-support.patch} | 12 ++- ...eson-add-saradc-node-to-ODROID-N2-N2.patch | 37 --------- ...dts-meson-g12b-add-GPIO-fan-support.patch} | 14 ++-- ...-add-GPIO-line-names-to-ODROID-N2-N2.patch | 78 ------------------- ...12b-odroid-n2-add-fan-as-cooling-de.patch} | 14 ++-- ...004-arm64-dts-meson-add-uart_A-node.patch} | 14 ++-- ...meson-add-i2c2-node-to-ODROID-N2-N2.patch} | 14 ++-- ...-ODROID-C4-arm64-dts-add-uart_A-node.patch | 43 ++++++++++ ...OID-C4-arm64-dts-add-i2c2-i2c3-node.patch} | 33 ++++---- ...ke-sure-no-map-does-not-remove-alrea.patch | 52 ------------- ...-drm-meson_drv-add-shutdown-function.patch | 48 ------------ ...el-0013-C4-arm64-dts-add-uart_A-node.patch | 41 ---------- .../board/pc/generic-x86-64/kernel.config | 11 ++- buildroot-external/board/pc/ova/kernel.config | 10 +++ ...e-missed-beacon-timeout-configurable.patch | 30 +++---- .../configs/generic_aarch64_defconfig | 4 +- .../configs/generic_x86_64_defconfig | 5 +- .../configs/khadas_vim3_defconfig | 2 +- .../configs/odroid_c2_defconfig | 4 +- .../configs/odroid_c4_defconfig | 4 +- .../configs/odroid_n2_defconfig | 4 +- .../configs/odroid_xu4_defconfig | 4 +- buildroot-external/configs/ova_defconfig | 4 +- buildroot-external/configs/rpi2_defconfig | 2 +- buildroot-external/configs/rpi3_64_defconfig | 2 +- buildroot-external/configs/rpi3_defconfig | 2 +- buildroot-external/configs/rpi4_64_defconfig | 2 +- buildroot-external/configs/rpi4_defconfig | 2 +- buildroot-external/configs/tinker_defconfig | 4 +- buildroot-external/configs/yellow_defconfig | 2 +- .../package/intel-e1000e/Config.in | 11 --- .../package/intel-e1000e/intel-e1000e.hash | 5 -- .../package/intel-e1000e/intel-e1000e.mk | 20 ----- 36 files changed, 157 insertions(+), 445 deletions(-) delete mode 100644 buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-aliases-t.patch rename buildroot-external/board/hardkernel/patches/linux/{0004-arm64-dts-meson-g12b-add-power-button-support.patch => 0001-arm64-dts-meson-g12b-add-power-button-support.patch} (70%) delete mode 100644 buildroot-external/board/hardkernel/patches/linux/0002-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch rename buildroot-external/board/hardkernel/patches/linux/{0005-arm64-dts-meson-g12b-add-GPIO-fan-support.patch => 0002-arm64-dts-meson-g12b-add-GPIO-fan-support.patch} (74%) delete mode 100644 buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch rename buildroot-external/board/hardkernel/patches/linux/{0006-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch => 0003-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch} (83%) rename buildroot-external/board/hardkernel/patches/linux/{0007-arm64-dts-meson-add-uart_A-node.patch => 0004-arm64-dts-meson-add-uart_A-node.patch} (71%) rename buildroot-external/board/hardkernel/patches/linux/{0008-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch => 0005-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch} (71%) create mode 100644 buildroot-external/board/hardkernel/patches/linux/0006-ODROID-C4-arm64-dts-add-uart_A-node.patch rename buildroot-external/board/hardkernel/patches/linux/{hardkernel-0021-C4-arm64-dts-add-i2c2-i2c3-node.patch => 0007-ODROID-C4-arm64-dts-add-i2c2-i2c3-node.patch} (59%) delete mode 100644 buildroot-external/board/hardkernel/patches/linux/0009-Revert-of-fdt-Make-sure-no-map-does-not-remove-alrea.patch delete mode 100644 buildroot-external/board/hardkernel/patches/linux/0010-Revert-drm-meson_drv-add-shutdown-function.patch delete mode 100644 buildroot-external/board/hardkernel/patches/linux/hardkernel-0013-C4-arm64-dts-add-uart_A-node.patch delete mode 100644 buildroot-external/package/intel-e1000e/Config.in delete mode 100644 buildroot-external/package/intel-e1000e/intel-e1000e.hash delete mode 100644 buildroot-external/package/intel-e1000e/intel-e1000e.mk diff --git a/Documentation/kernel.md b/Documentation/kernel.md index 3b158b93d..d90b25b09 100644 --- a/Documentation/kernel.md +++ b/Documentation/kernel.md @@ -5,15 +5,15 @@ Default Kernel tree: 5.10 | Board | Version | |-------|---------| -| Open Virtual Appliance | 5.10.102 | +| Open Virtual Appliance | 5.15.25 | | Raspberry Pi | 5.10.92 | | Raspberry Pi 0-W | 5.10.92 | | Raspberry Pi 2 | 5.10.92 | | Raspberry Pi 3 | 5.10.92 | | Raspberry Pi 4 | 5.10.92 | -| Tinker Board | 5.10.102 | -| Odroid-C2 | 5.10.102 | -| Odroid-C4 | 5.10.102 | -| Odroid-N2 | 5.10.102 | -| Odroid-XU4 | 5.10.102 | -| Generic x86-64 | 5.10.102 | +| Tinker Board | 5.15.25 | +| Odroid-C2 | 5.15.25 | +| Odroid-C4 | 5.15.25 | +| Odroid-N2 | 5.15.25 | +| Odroid-XU4 | 5.15.25 | +| Generic x86-64 | 5.15.25 | diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index 611e1d37b..0e4bdc0c8 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -4,7 +4,6 @@ source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-rtl8723/Config.in" source "$BR2_EXTERNAL_HASSOS_PATH/package/hardkernel-boot/Config.in" source "$BR2_EXTERNAL_HASSOS_PATH/package/khadas-boot/Config.in" source "$BR2_EXTERNAL_HASSOS_PATH/package/qemu-guest-agent/Config.in" -source "$BR2_EXTERNAL_HASSOS_PATH/package/intel-e1000e/Config.in" source "$BR2_EXTERNAL_HASSOS_PATH/package/rpi-eeprom/Config.in" source "$BR2_EXTERNAL_HASSOS_PATH/package/os-agent/Config.in" source "$BR2_EXTERNAL_HASSOS_PATH/package/udisks2/Config.in" diff --git a/buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-aliases-t.patch b/buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-aliases-t.patch deleted file mode 100644 index 414137809..000000000 --- a/buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-aliases-t.patch +++ /dev/null @@ -1,53 +0,0 @@ -From c7825747afd8bb975dc918f28e4afe8058a518f3 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Christian Hewitt -Date: Mon, 11 Jan 2021 13:58:31 +0000 -Subject: [PATCH 01/10] arm64: dts: meson: add i2c3/rtc nodes and rtc aliases - to ODROID-N2 dtsi - -Enable the onboard pcf8563 rtc hardware on ODROID N2/N2+ boards via the -common dtsi. Also add aliases to ensure vrtc does not claim /dev/rtc0. - -Signed-off-by: Christian Hewitt -Reviewed-by: Neil Armstrong -Signed-off-by: Kevin Hilman -Link: https://lore.kernel.org/r/20210111135831.2218-1-christianshewitt@gmail.com ---- - .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -index 39a09661c5f6..b78be3e6974d 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -@@ -13,6 +13,8 @@ / { - aliases { - serial0 = &uart_AO; - ethernet0 = ðmac; -+ rtc0 = &rtc; -+ rtc1 = &vrtc; - }; - - dioo2133: audio-amplifier-0 { -@@ -478,6 +480,18 @@ &ir { - linux,rc-map-name = "rc-odroid"; - }; - -+&i2c3 { -+ status = "okay"; -+ pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>; -+ pinctrl-names = "default"; -+ -+ rtc: rtc@51 { -+ compatible = "nxp,pcf8563"; -+ reg = <0x51>; -+ wakeup-source; -+ }; -+}; -+ - &pwm_ab { - pinctrl-0 = <&pwm_a_e_pins>; - pinctrl-names = "default"; --- -2.34.1 - diff --git a/buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-g12b-add-power-button-support.patch b/buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-g12b-add-power-button-support.patch similarity index 70% rename from buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-g12b-add-power-button-support.patch rename to buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-g12b-add-power-button-support.patch index b3b3f0a83..ca037da98 100644 --- a/buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-g12b-add-power-button-support.patch +++ b/buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-g12b-add-power-button-support.patch @@ -1,10 +1,8 @@ -From 70e65f906389f7236fe9ad8e1c05dedac0d1988b Mon Sep 17 00:00:00 2001 -Message-Id: <70e65f906389f7236fe9ad8e1c05dedac0d1988b.1642331593.git.stefan@agner.ch> -In-Reply-To: -References: +From 9f8390a715bc58e7423b65a18c4499761c84b819 Mon Sep 17 00:00:00 2001 +Message-Id: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch> From: Stefan Agner Date: Mon, 11 Jan 2021 11:20:48 +0100 -Subject: [PATCH 04/10] arm64: dts: meson: g12b: add power button support +Subject: [PATCH 1/7] arm64: dts: meson: g12b: add power button support Add power button support on J2 pin 11 (GPIOX_3 on the SoC side). The GPIO is low active, e.g. when connecting with pin 9 (GND) a power @@ -16,7 +14,7 @@ Signed-off-by: Stefan Agner 1 file changed, 11 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -index 41b2f9c96b5f..4b6bb7e74e25 100644 +index d33e54b5e196..5f0f036b1265 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi @@ -39,6 +39,17 @@ emmc_pwrseq: emmc-pwrseq { @@ -38,5 +36,5 @@ index 41b2f9c96b5f..4b6bb7e74e25 100644 compatible = "gpio-leds"; -- -2.34.1 +2.35.1 diff --git a/buildroot-external/board/hardkernel/patches/linux/0002-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch b/buildroot-external/board/hardkernel/patches/linux/0002-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch deleted file mode 100644 index 012f77af5..000000000 --- a/buildroot-external/board/hardkernel/patches/linux/0002-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ec3b1240b428c5652ccb7fdadad217a2ff8ab4db Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: -From: Hyeonki Hong -Date: Wed, 7 Apr 2021 04:26:08 +0000 -Subject: [PATCH 02/10] arm64: dts: meson: add saradc node to ODROID N2/N2+ - -Add the meson saradc node to the ODROID N2/N2+ common dtsi. - -Signed-off-by: Hyeonki Hong -Signed-off-by: Christian Hewitt -Signed-off-by: Kevin Hilman -Link: https://lore.kernel.org/r/20210407042609.9736-3-christianshewitt@gmail.com ---- - arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -index b78be3e6974d..8a5e132c4b79 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -@@ -508,6 +508,11 @@ &pwm_AO_cd { - status = "okay"; - }; - -+&saradc { -+ status = "okay"; -+ vref-supply = <&vddao_1v8>; -+}; -+ - /* SD card */ - &sd_emmc_b { - status = "okay"; --- -2.34.1 - diff --git a/buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-g12b-add-GPIO-fan-support.patch b/buildroot-external/board/hardkernel/patches/linux/0002-arm64-dts-meson-g12b-add-GPIO-fan-support.patch similarity index 74% rename from buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-g12b-add-GPIO-fan-support.patch rename to buildroot-external/board/hardkernel/patches/linux/0002-arm64-dts-meson-g12b-add-GPIO-fan-support.patch index b840921ce..7a9e992a1 100644 --- a/buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-g12b-add-GPIO-fan-support.patch +++ b/buildroot-external/board/hardkernel/patches/linux/0002-arm64-dts-meson-g12b-add-GPIO-fan-support.patch @@ -1,10 +1,10 @@ -From 86d9151effff69d2a8fc2027a31dd60bd8c6eb05 Mon Sep 17 00:00:00 2001 -Message-Id: <86d9151effff69d2a8fc2027a31dd60bd8c6eb05.1642331593.git.stefan@agner.ch> -In-Reply-To: -References: +From 26917e25696e7156a85d4dfcc578cb4cf4f42dde Mon Sep 17 00:00:00 2001 +Message-Id: <26917e25696e7156a85d4dfcc578cb4cf4f42dde.1646168061.git.stefan@agner.ch> +In-Reply-To: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch> +References: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch> From: Stefan Agner Date: Mon, 11 Jan 2021 11:38:54 +0100 -Subject: [PATCH 05/10] arm64: dts: meson: g12b: add GPIO fan support +Subject: [PATCH 2/7] arm64: dts: meson: g12b: add GPIO fan support Add simple GPIO fan node to support a fan on GPIO J8. Unfortunately the pad used to control the fan does not support real PWM, hence the RPM @@ -16,7 +16,7 @@ Signed-off-by: Stefan Agner 1 file changed, 11 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -index 4b6bb7e74e25..e8a3ede698b5 100644 +index 5f0f036b1265..36dbd2666015 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi @@ -39,6 +39,17 @@ emmc_pwrseq: emmc-pwrseq { @@ -38,5 +38,5 @@ index 4b6bb7e74e25..e8a3ede698b5 100644 compatible = "gpio-keys-polled"; poll-interval = <100>; -- -2.34.1 +2.35.1 diff --git a/buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch b/buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch deleted file mode 100644 index 6f52aedfd..000000000 --- a/buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 5ca49a58577f7e9e6f8e0b1cb7c97e756a0e921f Mon Sep 17 00:00:00 2001 -Message-Id: <5ca49a58577f7e9e6f8e0b1cb7c97e756a0e921f.1642331593.git.stefan@agner.ch> -In-Reply-To: -References: -From: Hyeonki Hong -Date: Wed, 7 Apr 2021 04:26:09 +0000 -Subject: [PATCH 03/10] arm64: dts: meson: add GPIO line names to ODROID N2/N2+ - -Add GPIO line-name identifiers to the ODROID N2/N2+ common dtsi. - -Signed-off-by: Hyeonki Hong -Signed-off-by: Christian Hewitt -Reviewed-by: Neil Armstrong -Signed-off-by: Kevin Hilman -Link: https://lore.kernel.org/r/20210407042609.9736-4-christianshewitt@gmail.com ---- - .../dts/amlogic/meson-g12b-odroid-n2.dtsi | 45 +++++++++++++++++++ - 1 file changed, 45 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -index 8a5e132c4b79..41b2f9c96b5f 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -@@ -446,6 +446,51 @@ &frddr_c { - }; - - &gpio { -+ gpio-line-names = -+ /* GPIOZ */ -+ "", "", "", "", "", "", "", "", -+ "", "", "", "", "", "", "", "", -+ /* GPIOH */ -+ "", "", "", "", "", "", "", "", -+ "", -+ /* BOOT */ -+ "", "", "", "", "", "", "", "", -+ "", "", "", "", "", "", "", "", -+ /* GPIOC */ -+ "", "", "", "", "", "", "", "", -+ /* GPIOA */ -+ "PIN_44", /* GPIOA_0 */ -+ "PIN_46", /* GPIOA_1 */ -+ "PIN_45", /* GPIOA_2 */ -+ "PIN_47", /* GPIOA_3 */ -+ "PIN_26", /* GPIOA_4 */ -+ "", "", "", "", "", "", -+ "PIN_42", /* GPIOA_11 */ -+ "PIN_32", /* GPIOA_12 */ -+ "PIN_7", /* GPIOA_13 */ -+ "PIN_27", /* GPIOA_14 */ -+ "PIN_28", /* GPIOA_15 */ -+ /* GPIOX */ -+ "PIN_16", /* GPIOX_0 */ -+ "PIN_18", /* GPIOX_1 */ -+ "PIN_22", /* GPIOX_2 */ -+ "PIN_11", /* GPIOX_3 */ -+ "PIN_13", /* GPIOX_4 */ -+ "PIN_33", /* GPIOX_5 */ -+ "PIN_35", /* GPIOX_6 */ -+ "PIN_15", /* GPIOX_7 */ -+ "PIN_19", /* GPIOX_8 */ -+ "PIN_21", /* GPIOX_9 */ -+ "PIN_24", /* GPIOX_10 */ -+ "PIN_23", /* GPIOX_11 */ -+ "PIN_8", /* GPIOX_12 */ -+ "PIN_10", /* GPIOX_13 */ -+ "PIN_29", /* GPIOX_14 */ -+ "PIN_31", /* GPIOX_15 */ -+ "PIN_12", /* GPIOX_16 */ -+ "PIN_3", /* GPIOX_17 */ -+ "PIN_5", /* GPIOX_18 */ -+ "PIN_36"; /* GPIOX_19 */ - /* - * WARNING: The USB Hub on the Odroid-N2 needs a reset signal - * to be turned high in order to be detected by the USB Controller --- -2.34.1 - diff --git a/buildroot-external/board/hardkernel/patches/linux/0006-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch b/buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch similarity index 83% rename from buildroot-external/board/hardkernel/patches/linux/0006-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch rename to buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch index e36ca2351..8b918d565 100644 --- a/buildroot-external/board/hardkernel/patches/linux/0006-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch +++ b/buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch @@ -1,10 +1,10 @@ -From f1120f132dbdf2e7f7acf328de55bbdce877d882 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From 5b2b8c960269eba18f0557bf49990b9c28e5e6af Mon Sep 17 00:00:00 2001 +Message-Id: <5b2b8c960269eba18f0557bf49990b9c28e5e6af.1646168061.git.stefan@agner.ch> +In-Reply-To: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch> +References: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch> From: Stefan Agner Date: Mon, 11 Jan 2021 15:53:55 +0100 -Subject: [PATCH 06/10] arm64: dts: meson: g12b: odroid-n2: add fan as cooling +Subject: [PATCH 3/7] arm64: dts: meson: g12b: odroid-n2: add fan as cooling device MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -21,7 +21,7 @@ Signed-off-by: Stefan Agner 1 file changed, 38 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -index e8a3ede698b5..dd345c6aa4b5 100644 +index 36dbd2666015..5ca75696bd5c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi @@ -388,6 +388,44 @@ &clkc_audio { @@ -70,5 +70,5 @@ index e8a3ede698b5..dd345c6aa4b5 100644 cpu-supply = <&vddcpu_b>; operating-points-v2 = <&cpu_opp_table_0>; -- -2.34.1 +2.35.1 diff --git a/buildroot-external/board/hardkernel/patches/linux/0007-arm64-dts-meson-add-uart_A-node.patch b/buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-add-uart_A-node.patch similarity index 71% rename from buildroot-external/board/hardkernel/patches/linux/0007-arm64-dts-meson-add-uart_A-node.patch rename to buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-add-uart_A-node.patch index 484c9cf3b..3840c5254 100644 --- a/buildroot-external/board/hardkernel/patches/linux/0007-arm64-dts-meson-add-uart_A-node.patch +++ b/buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-add-uart_A-node.patch @@ -1,10 +1,10 @@ -From dcaf2dc71dd62487eb37561682934414a5795e0e Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From fee88e0053de7878977913311bdb153494aa6c61 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch> +References: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch> From: Hyeonki Hong Date: Fri, 27 Mar 2020 17:05:22 +0900 -Subject: [PATCH 07/10] arm64: dts: meson: add uart_A node +Subject: [PATCH 4/7] arm64: dts: meson: add uart_A node The UART_A is available through J3 pin 8/10 and documented to be available as UART by default. @@ -15,7 +15,7 @@ Signed-off-by: Stefan Agner 1 file changed, 7 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -index dd345c6aa4b5..cec346178e3d 100644 +index 5ca75696bd5c..738eb0339333 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi @@ -12,6 +12,7 @@ @@ -40,5 +40,5 @@ index dd345c6aa4b5..cec346178e3d 100644 status = "okay"; pinctrl-0 = <&uart_ao_a_pins>; -- -2.34.1 +2.35.1 diff --git a/buildroot-external/board/hardkernel/patches/linux/0008-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch b/buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch similarity index 71% rename from buildroot-external/board/hardkernel/patches/linux/0008-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch rename to buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch index 73759a834..e1faf4bfc 100644 --- a/buildroot-external/board/hardkernel/patches/linux/0008-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch +++ b/buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch @@ -1,10 +1,10 @@ -From d5d2d8b9eb93eab85af12f1844975903a7c5a879 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From 51ded393003a60d3932081114bff142c4c69b293 Mon Sep 17 00:00:00 2001 +Message-Id: <51ded393003a60d3932081114bff142c4c69b293.1646168061.git.stefan@agner.ch> +In-Reply-To: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch> +References: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch> From: Stefan Agner Date: Thu, 29 Apr 2021 21:32:43 +0200 -Subject: [PATCH 08/10] arm64: dts: meson: add i2c2 node to ODROID N2/N2+ +Subject: [PATCH 5/7] arm64: dts: meson: add i2c2 node to ODROID N2/N2+ The J2 connectors pinout documents "I2C.SDA0/SCL0" on pin 3 and 5, which are connected to GPIOX_17/18. This GPIO allow to mux I2C to the second @@ -16,7 +16,7 @@ Signed-off-by: Stefan Agner 1 file changed, 6 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -index cec346178e3d..f1c3356c78a0 100644 +index 738eb0339333..2e9fefc20b19 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi @@ -586,6 +586,12 @@ &ir { @@ -33,5 +33,5 @@ index cec346178e3d..f1c3356c78a0 100644 status = "okay"; pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>; -- -2.34.1 +2.35.1 diff --git a/buildroot-external/board/hardkernel/patches/linux/0006-ODROID-C4-arm64-dts-add-uart_A-node.patch b/buildroot-external/board/hardkernel/patches/linux/0006-ODROID-C4-arm64-dts-add-uart_A-node.patch new file mode 100644 index 000000000..f23274db9 --- /dev/null +++ b/buildroot-external/board/hardkernel/patches/linux/0006-ODROID-C4-arm64-dts-add-uart_A-node.patch @@ -0,0 +1,43 @@ +From 0ad900b2d6e895b1f1788d51e471863743727d71 Mon Sep 17 00:00:00 2001 +Message-Id: <0ad900b2d6e895b1f1788d51e471863743727d71.1646168061.git.stefan@agner.ch> +In-Reply-To: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch> +References: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch> +From: Hyeonki Hong +Date: Tue, 1 Mar 2022 21:51:50 +0100 +Subject: [PATCH 6/7] ODROID-C4: arm64/dts: add uart_A node + +--- + arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi +index 76ad052fbf0c..690e4823a9d0 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi +@@ -10,8 +10,9 @@ + + / { + aliases { +- serial0 = &uart_AO; + ethernet0 = ðmac; ++ serial0 = &uart_AO; ++ serial1 = &uart_A; + }; + + chosen { +@@ -436,6 +437,12 @@ &tohdmitx { + status = "okay"; + }; + ++&uart_A { ++ status = "okay"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart_a_pins>; ++}; ++ + &uart_AO { + status = "okay"; + pinctrl-0 = <&uart_ao_a_pins>; +-- +2.35.1 + diff --git a/buildroot-external/board/hardkernel/patches/linux/hardkernel-0021-C4-arm64-dts-add-i2c2-i2c3-node.patch b/buildroot-external/board/hardkernel/patches/linux/0007-ODROID-C4-arm64-dts-add-i2c2-i2c3-node.patch similarity index 59% rename from buildroot-external/board/hardkernel/patches/linux/hardkernel-0021-C4-arm64-dts-add-i2c2-i2c3-node.patch rename to buildroot-external/board/hardkernel/patches/linux/0007-ODROID-C4-arm64-dts-add-i2c2-i2c3-node.patch index d092c7c76..714ebf816 100644 --- a/buildroot-external/board/hardkernel/patches/linux/hardkernel-0021-C4-arm64-dts-add-i2c2-i2c3-node.patch +++ b/buildroot-external/board/hardkernel/patches/linux/0007-ODROID-C4-arm64-dts-add-i2c2-i2c3-node.patch @@ -1,29 +1,30 @@ -From 400645dd70ae5a0efbbce35067c8674d380ed2a7 Mon Sep 17 00:00:00 2001 +From 105003d49a505e0f0e033a6f3d945f745912c7b1 Mon Sep 17 00:00:00 2001 +Message-Id: <105003d49a505e0f0e033a6f3d945f745912c7b1.1646168061.git.stefan@agner.ch> +In-Reply-To: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch> +References: <9f8390a715bc58e7423b65a18c4499761c84b819.1646168061.git.stefan@agner.ch> From: Hyeonki Hong -Date: Wed, 13 May 2020 10:37:28 +0900 -Subject: [PATCH 21/74] ODROID-C4: arm64/dts: add i2c2, i2c3 node +Date: Tue, 1 Mar 2022 21:53:32 +0100 +Subject: [PATCH 7/7] ODROID-C4: arm64/dts: add i2c2, i2c3 node -Change-Id: Id75f935111744ff6945791deefef20f897dc98ac -(cherry picked from commit 3f4b2ffd0905946175c478baa65361695e78e0de) --- - .../boot/dts/amlogic/meson-sm1-odroid-c4.dts | 53 +++++++++++++++++++ + .../boot/dts/amlogic/meson-sm1-odroid.dtsi | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) -diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts -index 831053aa6dff..5988dc5f34d0 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts -@@ -16,6 +16,8 @@ / { - +diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi +index 690e4823a9d0..85637c1c846b 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi +@@ -11,6 +11,8 @@ + / { aliases { ethernet0 = ðmac; + i2c0 = &i2c2; + i2c1 = &i2c3; serial0 = &uart_AO; serial1 = &uart_A; - spi0 = &spicc0; -@@ -434,6 +436,57 @@ &ir { - linux,rc-map-name = "rc-odroid"; + }; +@@ -373,6 +375,57 @@ &ir { + pinctrl-names = "default"; }; +&i2c2 { @@ -81,5 +82,5 @@ index 831053aa6dff..5988dc5f34d0 100644 pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-names = "default"; -- -2.25.1 +2.35.1 diff --git a/buildroot-external/board/hardkernel/patches/linux/0009-Revert-of-fdt-Make-sure-no-map-does-not-remove-alrea.patch b/buildroot-external/board/hardkernel/patches/linux/0009-Revert-of-fdt-Make-sure-no-map-does-not-remove-alrea.patch deleted file mode 100644 index 1e63dbba1..000000000 --- a/buildroot-external/board/hardkernel/patches/linux/0009-Revert-of-fdt-Make-sure-no-map-does-not-remove-alrea.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 19c34c0ceb6302b07e1017c426796c4cf7322d13 Mon Sep 17 00:00:00 2001 -Message-Id: <19c34c0ceb6302b07e1017c426796c4cf7322d13.1642331593.git.stefan@agner.ch> -In-Reply-To: -References: -From: Stefan Agner -Date: Mon, 26 Jul 2021 16:59:08 +0200 -Subject: [PATCH 09/10] Revert "of/fdt: Make sure no-map does not remove - already reserved regions" - -U-Boot on Hardkernel ODROID-N2 adds fdt "memreserve" entries alongside -the reserved-memory nodes present in upstream Linux. This causes -reserving memory with the no-map flag to fail: -[ 0.000000] OF: fdt: Reserved memory: failed to reserve memory for node 'secmon@5000000': base 0x0000000005000000, size 3 MiB - -This seems to cause kernel crashes such as: -[129988.642342] SError Interrupt on CPU4, code 0xbf000000 -- SError - -Restore the bahavior of Linux kernel 5.9 and older and don't fail -updating the mapping with no-map. - -This reverts commit 8a5a75e5e9e55de1cef5d83ca3589cb4899193ef. - -Signed-off-by: Stefan Agner ---- - drivers/of/fdt.c | 10 +--------- - 1 file changed, 1 insertion(+), 9 deletions(-) - -diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c -index 57ff31b6b1e4..7ef2246e0b1e 100644 ---- a/drivers/of/fdt.c -+++ b/drivers/of/fdt.c -@@ -1149,16 +1149,8 @@ int __init __weak early_init_dt_mark_hotplug_memory_arch(u64 base, u64 size) - int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base, - phys_addr_t size, bool nomap) - { -- if (nomap) { -- /* -- * If the memory is already reserved (by another region), we -- * should not allow it to be marked nomap. -- */ -- if (memblock_is_region_reserved(base, size)) -- return -EBUSY; -- -+ if (nomap) - return memblock_mark_nomap(base, size); -- } - return memblock_reserve(base, size); - } - --- -2.34.1 - diff --git a/buildroot-external/board/hardkernel/patches/linux/0010-Revert-drm-meson_drv-add-shutdown-function.patch b/buildroot-external/board/hardkernel/patches/linux/0010-Revert-drm-meson_drv-add-shutdown-function.patch deleted file mode 100644 index eddd0232f..000000000 --- a/buildroot-external/board/hardkernel/patches/linux/0010-Revert-drm-meson_drv-add-shutdown-function.patch +++ /dev/null @@ -1,48 +0,0 @@ -From be21685475a0739d44ca4c63fcb7f50b324593c9 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: -From: Stefan Agner -Date: Sun, 16 Jan 2022 12:12:29 +0100 -Subject: [PATCH 10/10] Revert "drm: meson_drv add shutdown function" - -This reverts commit d4ec1ffbdaa8939a208656e9c1440742c457ef16. - -It seems that this patch actually breaks reboot on ODROID-N2+. ---- - drivers/gpu/drm/meson/meson_drv.c | 12 ------------ - 1 file changed, 12 deletions(-) - -diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c -index 2753067c08e6..3d1de9cbb1c8 100644 ---- a/drivers/gpu/drm/meson/meson_drv.c -+++ b/drivers/gpu/drm/meson/meson_drv.c -@@ -482,17 +482,6 @@ static int meson_probe_remote(struct platform_device *pdev, - return count; - } - --static void meson_drv_shutdown(struct platform_device *pdev) --{ -- struct meson_drm *priv = dev_get_drvdata(&pdev->dev); -- -- if (!priv) -- return; -- -- drm_kms_helper_poll_fini(priv->drm); -- drm_atomic_helper_shutdown(priv->drm); --} -- - static int meson_drv_probe(struct platform_device *pdev) - { - struct component_match *match = NULL; -@@ -564,7 +553,6 @@ static const struct dev_pm_ops meson_drv_pm_ops = { - - static struct platform_driver meson_drm_platform_driver = { - .probe = meson_drv_probe, -- .shutdown = meson_drv_shutdown, - .driver = { - .name = "meson-drm", - .of_match_table = dt_match, --- -2.34.1 - diff --git a/buildroot-external/board/hardkernel/patches/linux/hardkernel-0013-C4-arm64-dts-add-uart_A-node.patch b/buildroot-external/board/hardkernel/patches/linux/hardkernel-0013-C4-arm64-dts-add-uart_A-node.patch deleted file mode 100644 index 62ca2d1c7..000000000 --- a/buildroot-external/board/hardkernel/patches/linux/hardkernel-0013-C4-arm64-dts-add-uart_A-node.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ca89096189299862a7b2b3123d96fc8bfbe74ce3 Mon Sep 17 00:00:00 2001 -From: Hyeonki Hong -Date: Tue, 14 Apr 2020 14:15:25 +0900 -Subject: [PATCH 13/74] ODROID-C4: arm64/dts: add uart_A node - -Change-Id: Ib66a03da2fcf39fc459c20c9f98b1baca34dcf5b ---- - arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts -index 1b749bd340ce..e5d73598c131 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts -@@ -14,8 +14,9 @@ / { - model = "Hardkernel ODROID-C4"; - - aliases { -- serial0 = &uart_AO; - ethernet0 = ðmac; -+ serial0 = &uart_AO; -+ serial1 = &uart_A; - }; - - chosen { -@@ -385,6 +386,12 @@ &sd_emmc_c { - vqmmc-supply = <&flash_1v8>; - }; - -+&uart_A { -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart_a_pins>; -+}; -+ - &uart_AO { - status = "okay"; - pinctrl-0 = <&uart_ao_a_pins>; --- -2.25.1 - diff --git a/buildroot-external/board/pc/generic-x86-64/kernel.config b/buildroot-external/board/pc/generic-x86-64/kernel.config index 84b065427..579de7ce5 100644 --- a/buildroot-external/board/pc/generic-x86-64/kernel.config +++ b/buildroot-external/board/pc/generic-x86-64/kernel.config @@ -4,8 +4,6 @@ CONFIG_SCSI_LOWLEVEL=y CONFIG_USB_XHCI_HCD=y CONFIG_BLK_DEV_NVME=y -# CONFIG_E1000E is not set - CONFIG_IGB=y CONFIG_IGC=m @@ -27,6 +25,15 @@ CONFIG_BNXT=m CONFIG_IWLWIFI=m CONFIG_IWLMVM=m +CONFIG_SYSFB=y +CONFIG_SYSFB_SIMPLEFB=y + +CONFIG_FB=y +CONFIG_FB_EFI=y + +CONFIG_DRM=y +CONFIG_DRM_FBDEV_EMULATION=y +CONFIG_DRM_SIMPLEDRM=y CONFIG_DRM_I915=m CONFIG_DRM_I915_CAPTURE_ERROR=y CONFIG_DRM_I915_COMPRESS_ERROR=y diff --git a/buildroot-external/board/pc/ova/kernel.config b/buildroot-external/board/pc/ova/kernel.config index e3a00d915..fbfa3e8f4 100644 --- a/buildroot-external/board/pc/ova/kernel.config +++ b/buildroot-external/board/pc/ova/kernel.config @@ -51,6 +51,16 @@ CONFIG_XEN_BLKDEV_FRONTEND=y CONFIG_SND_XEN_FRONTEND=y CONFIG_XEN_PVCALLS_FRONTEND=m CONFIG_XEN_WDT=y + +CONFIG_SYSFB=y +CONFIG_SYSFB_SIMPLEFB=y + +CONFIG_FB=y +CONFIG_FB_EFI=y + +CONFIG_DRM=y +CONFIG_DRM_FBDEV_EMULATION=y +CONFIG_DRM_SIMPLEDRM=y CONFIG_DRM_XEN=y CONFIG_HYPERVISOR_GUEST=y diff --git a/buildroot-external/board/pc/patches/linux/0001-iwlwifi-Make-missed-beacon-timeout-configurable.patch b/buildroot-external/board/pc/patches/linux/0001-iwlwifi-Make-missed-beacon-timeout-configurable.patch index 8029126ef..e06147e9d 100644 --- a/buildroot-external/board/pc/patches/linux/0001-iwlwifi-Make-missed-beacon-timeout-configurable.patch +++ b/buildroot-external/board/pc/patches/linux/0001-iwlwifi-Make-missed-beacon-timeout-configurable.patch @@ -1,8 +1,8 @@ -From 6e5d979ec45555720a6537eb006947dca825afc0 Mon Sep 17 00:00:00 2001 -Message-Id: <6e5d979ec45555720a6537eb006947dca825afc0.1644327234.git.stefan@agner.ch> +From d6be44a647dc6ae5ad2dcf44ff4a97030f1c498e Mon Sep 17 00:00:00 2001 +Message-Id: From: Zachary Michaels Date: Thu, 7 Jan 2021 08:13:11 -0800 -Subject: [PATCH 1/2] iwlwifi: Make missed beacon timeout configurable +Subject: [PATCH] iwlwifi: Make missed beacon timeout configurable Makes the beacon timeout a module parameter, allowing the original default (16 missed beacons) to be kept while also enabling users that experience problems to @@ -19,10 +19,10 @@ Signed-off-by: Stefan Agner 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c -index 30c6d7b18599..d64cec9d593d 100644 +index 524b0ad87357..a055674f14c6 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c -@@ -1741,6 +1741,7 @@ struct iwl_mod_params iwlwifi_mod_params = { +@@ -1711,6 +1711,7 @@ struct iwl_mod_params iwlwifi_mod_params = { .power_level = IWL_POWER_INDEX_1, .uapsd_disable = IWL_DISABLE_UAPSD_BSS | IWL_DISABLE_UAPSD_P2P_CLIENT, .enable_ini = true, @@ -30,7 +30,7 @@ index 30c6d7b18599..d64cec9d593d 100644 /* the rest are 0 by default */ }; IWL_EXPORT_SYMBOL(iwlwifi_mod_params); -@@ -1858,6 +1859,9 @@ module_param_named(enable_ini, iwlwifi_mod_params.enable_ini, +@@ -1826,6 +1827,9 @@ module_param_named(enable_ini, iwlwifi_mod_params.enable_ini, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(enable_ini, "Enable debug INI TLV FW debug infrastructure (default: true"); @@ -41,10 +41,10 @@ index 30c6d7b18599..d64cec9d593d 100644 /* * set bt_coex_active to true, uCode will do kill/defer diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h b/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h -index e8ce3a300857..801d12a27354 100644 +index 004ebdac4535..198c5ac2575b 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h -@@ -115,6 +115,7 @@ enum iwl_uapsd_disable { +@@ -62,6 +62,7 @@ enum iwl_uapsd_disable { * @disable_11ac: disable VHT capabilities, default = false. * @remove_when_gone: remove an inaccessible device from the PCIe bus. * @enable_ini: enable new FW debug infratructure (INI TLVs) @@ -52,7 +52,7 @@ index e8ce3a300857..801d12a27354 100644 */ struct iwl_mod_params { int swcrypto; -@@ -137,6 +138,7 @@ struct iwl_mod_params { +@@ -84,6 +85,7 @@ struct iwl_mod_params { bool disable_11ax; bool remove_when_gone; bool enable_ini; @@ -61,18 +61,18 @@ index e8ce3a300857..801d12a27354 100644 static inline bool iwl_enable_rx_ampdu(void) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c -index 6a8bf9bb9c45..34dec6fc8f3e 100644 +index fd352b2624a6..2f70a36b1af9 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c -@@ -63,6 +63,7 @@ - #include +@@ -8,6 +8,7 @@ + #include #include #include "iwl-io.h" +#include "iwl-modparams.h" #include "iwl-prph.h" #include "fw-api.h" #include "mvm.h" -@@ -1430,7 +1431,7 @@ void iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm, +@@ -1398,7 +1399,7 @@ void iwl_mvm_rx_missed_beacons_notif(struct iwl_mvm *mvm, * TODO: the threshold should be adjusted based on latency conditions, * and/or in case of a CS flow on one of the other AP vifs. */ @@ -82,10 +82,10 @@ index 6a8bf9bb9c45..34dec6fc8f3e 100644 else if (rx_missed_bcon_since_rx > IWL_MVM_MISSED_BEACONS_THRESHOLD) ieee80211_beacon_loss(vif); diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h -index 64f5a4cb3d3a..730638da8fd3 100644 +index 46af8dd2dc93..bb05df29c88b 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h -@@ -92,7 +92,6 @@ +@@ -38,7 +38,6 @@ /* RSSI offset for WkP */ #define IWL_RSSI_OFFSET 50 #define IWL_MVM_MISSED_BEACONS_THRESHOLD 8 diff --git a/buildroot-external/configs/generic_aarch64_defconfig b/buildroot-external/configs/generic_aarch64_defconfig index c2dead5b0..2851b654e 100644 --- a/buildroot-external/configs/generic_aarch64_defconfig +++ b/buildroot-external/configs/generic_aarch64_defconfig @@ -35,14 +35,14 @@ BR2_INIT_SYSTEMD=y BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_HASSOS_PATH)/rootfs-overlay" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.98" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.25" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_USE_DEFCONFIG=n BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/arm-uefi/generic-aarch64/kernel.config" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config" BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y BR2_PACKAGE_PROCPS_NG=y diff --git a/buildroot-external/configs/generic_x86_64_defconfig b/buildroot-external/configs/generic_x86_64_defconfig index 82f31fee0..3658d54bc 100644 --- a/buildroot-external/configs/generic_x86_64_defconfig +++ b/buildroot-external/configs/generic_x86_64_defconfig @@ -21,13 +21,13 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.102" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.25" BR2_LINUX_KERNEL_DEFCONFIG="x86_64" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64/kernel.config" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config" BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y BR2_PACKAGE_PROCPS_NG=y @@ -115,7 +115,6 @@ BR2_PACKAGE_HASSIO_MACHINE="generic-x86-64" BR2_PACKAGE_APPARMOR=y BR2_PACKAGE_APPARMOR_PROFILES=y BR2_PACKAGE_LIBCURL_CURL=y -BR2_PACKAGE_INTEL_E1000E=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y BR2_PACKAGE_RPI_RF_MOD=y diff --git a/buildroot-external/configs/khadas_vim3_defconfig b/buildroot-external/configs/khadas_vim3_defconfig index 753dbb3ea..5705ff264 100644 --- a/buildroot-external/configs/khadas_vim3_defconfig +++ b/buildroot-external/configs/khadas_vim3_defconfig @@ -100,7 +100,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/khadas/vim3/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index 537e7f233..85e26a677 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/buildroot-external/configs/odroid_c2_defconfig @@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.102" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.25" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config" @@ -100,7 +100,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/odroid_c4_defconfig b/buildroot-external/configs/odroid_c4_defconfig index 430a51594..1632ecf2c 100644 --- a/buildroot-external/configs/odroid_c4_defconfig +++ b/buildroot-external/configs/odroid_c4_defconfig @@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.102" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.25" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config" @@ -100,7 +100,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/odroid_n2_defconfig b/buildroot-external/configs/odroid_n2_defconfig index 50fcd564c..827a965e1 100644 --- a/buildroot-external/configs/odroid_n2_defconfig +++ b/buildroot-external/configs/odroid_n2_defconfig @@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.102" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.25" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/kernel.config" @@ -100,7 +100,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig index d55d2b1c3..d365702c4 100644 --- a/buildroot-external/configs/odroid_xu4_defconfig +++ b/buildroot-external/configs/odroid_xu4_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.102" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.25" BR2_LINUX_KERNEL_DEFCONFIG="exynos" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config" BR2_LINUX_KERNEL_LZ4=y @@ -102,7 +102,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig index 4ca2518db..d12596c60 100644 --- a/buildroot-external/configs/ova_defconfig +++ b/buildroot-external/configs/ova_defconfig @@ -22,13 +22,13 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.102" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.25" BR2_LINUX_KERNEL_DEFCONFIG="x86_64" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova/kernel.config" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config" BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y BR2_PACKAGE_PROCPS_NG=y diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig index 25b0c409a..1c6561616 100644 --- a/buildroot-external/configs/rpi2_defconfig +++ b/buildroot-external/configs/rpi2_defconfig @@ -100,7 +100,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig index 3dbdfb094..8641251c4 100644 --- a/buildroot-external/configs/rpi3_64_defconfig +++ b/buildroot-external/configs/rpi3_64_defconfig @@ -101,7 +101,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot64.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index f05e09692..de47e73ad 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -101,7 +101,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig index 750af723b..64d5bd447 100644 --- a/buildroot-external/configs/rpi4_64_defconfig +++ b/buildroot-external/configs/rpi4_64_defconfig @@ -104,7 +104,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot64.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig index f70139764..eb2c4f487 100644 --- a/buildroot-external/configs/rpi4_defconfig +++ b/buildroot-external/configs/rpi4_defconfig @@ -102,7 +102,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/tinker_defconfig b/buildroot-external/configs/tinker_defconfig index 86056abb3..642d321b5 100644 --- a/buildroot-external/configs/tinker_defconfig +++ b/buildroot-external/configs/tinker_defconfig @@ -23,7 +23,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.102" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.25" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/kernel.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config" @@ -107,7 +107,7 @@ BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/uboot-boot.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/configs/yellow_defconfig b/buildroot-external/configs/yellow_defconfig index 507e2a335..cd9e11b78 100644 --- a/buildroot-external/configs/yellow_defconfig +++ b/buildroot-external/configs/yellow_defconfig @@ -105,7 +105,7 @@ BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/u BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/yellow/uboot-boot64.ush" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GPTFDISK=y diff --git a/buildroot-external/package/intel-e1000e/Config.in b/buildroot-external/package/intel-e1000e/Config.in deleted file mode 100644 index ed8b03238..000000000 --- a/buildroot-external/package/intel-e1000e/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -comment "e1000e needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL - -config BR2_PACKAGE_INTEL_E1000E - bool "Intel Network Adapter Driver for PCIe" - depends on BR2_LINUX_KERNEL - help - Install Intel Network Adapter Driver for PCIe - (external module) - - https://downloadcenter.intel.com/download/15817/Intel-Network-Adapter-Driver-for-PCIe-Intel-Gigabit-Ethernet-Network-Connections-Under-Linux- diff --git a/buildroot-external/package/intel-e1000e/intel-e1000e.hash b/buildroot-external/package/intel-e1000e/intel-e1000e.hash deleted file mode 100644 index fa9ea11f0..000000000 --- a/buildroot-external/package/intel-e1000e/intel-e1000e.hash +++ /dev/null @@ -1,5 +0,0 @@ -# from https://downloadcenter.intel.com/download/15817/Intel-Network-Adapter-Driver-for-PCIe-Intel-Gigabit-Ethernet-Network-Connections-Under-Linux- -md5 54a1488fe9e7ed56d2bb96aaa66f35e9 e1000e-3.8.7.tar.gz - -# Locally calculated -sha256 63bad49d2d37c975e5f5f88689c953eeb9be37b0ef035945c79820a95f480f11 e1000e-3.8.7.tar.gz diff --git a/buildroot-external/package/intel-e1000e/intel-e1000e.mk b/buildroot-external/package/intel-e1000e/intel-e1000e.mk deleted file mode 100644 index a55af04f5..000000000 --- a/buildroot-external/package/intel-e1000e/intel-e1000e.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# Intel Network Adapter Driver for PCIe -# -################################################################################ - -INTEL_E1000E_VERSION = 3.8.7 -INTEL_E1000E_LICENSE = GPL-2.0 -INTEL_E1000E_LICENSE_FILES = COPYING -INTEL_E1000E_SOURCE = e1000e-$(INTEL_E1000E_VERSION).tar.gz -INTEL_E1000E_SITE = https://downloads.sourceforge.net/project/e1000/e1000e%20historic%20archive/$(INTEL_E1000E_VERSION) -INTEL_E1000E_MODULE_SUBDIRS = src - -INTEL_E1000E_MODULE_MAKE_OPTS = \ - CONFIG_E1000E=m \ - KVER=$(LINUX_VERSION_PROBED) \ - KSRC=$(LINUX_DIR) - -$(eval $(kernel-module)) -$(eval $(generic-package))