From 2552fd1c7cccf7f864988cfa1f894cd5b651aca5 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 2 Dec 2022 10:05:37 +0000 Subject: [PATCH 01/12] linux (Rockchip): rebase patches for 6.0.11 --- .../patches/linux/default/linux-0001-rockchip-from-6.1.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/Rockchip/patches/linux/default/linux-0001-rockchip-from-6.1.patch b/projects/Rockchip/patches/linux/default/linux-0001-rockchip-from-6.1.patch index e5a757b059..aed2c1b577 100644 --- a/projects/Rockchip/patches/linux/default/linux-0001-rockchip-from-6.1.patch +++ b/projects/Rockchip/patches/linux/default/linux-0001-rockchip-from-6.1.patch @@ -48,7 +48,7 @@ index 528bb4e8ac77..c8315d703ad0 100644 @@ -177,11 +192,16 @@ rk809: pmic@20 { reg = <0x20>; interrupt-parent = <&gpio0>; - interrupts = ; + interrupts = ; + assigned-clocks = <&cru I2S1_MCLKOUT_TX>; + assigned-clock-parents = <&cru CLK_I2S1_8CH_TX>; + clock-names = "mclk"; From c421da1afca6d9628e038a01a596f9ab8435becc Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 2 Dec 2022 10:57:29 +0000 Subject: [PATCH 02/12] linux (Samsung): update .config for 6.0.11 --- projects/Samsung/linux/linux.arm.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/Samsung/linux/linux.arm.conf b/projects/Samsung/linux/linux.arm.conf index d15f378572..6e5b374d5f 100644 --- a/projects/Samsung/linux/linux.arm.conf +++ b/projects/Samsung/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.0.3-rc1 Kernel Configuration +# Linux/arm 6.0.11 Kernel Configuration # CONFIG_CC_VERSION_TEXT="armv7ve-libreelec-linux-gnueabihf-gcc-12.2.0 (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -14,6 +14,7 @@ CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y +CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0 @@ -895,6 +896,7 @@ CONFIG_NET_FOU=m # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set +CONFIG_INET_TABLE_PERTURB_ORDER=16 CONFIG_INET_TUNNEL=y CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y From c1bbcf864fcf2387addbab0864cd9313d045355b Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 2 Dec 2022 10:57:29 +0000 Subject: [PATCH 03/12] linux (Rockchip RK3399): update .config for 6.0.11 --- .../devices/RK3399/linux/default/linux.aarch64.conf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf b/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf index dd214a2dee..a5e5c3bccb 100644 --- a/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf +++ b/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.0.3 Kernel Configuration +# Linux/arm64 6.0.11 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-none-elf-gcc-12.2.0 (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -12,9 +12,10 @@ CONFIG_LD_IS_BFD=y CONFIG_LD_VERSION=23900 CONFIG_LLD_VERSION=0 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y +CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_PAHOLE_VERSION=122 +CONFIG_PAHOLE_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -974,6 +975,7 @@ CONFIG_NET_FOU=m # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set +CONFIG_INET_TABLE_PERTURB_ORDER=16 CONFIG_INET_TUNNEL=m CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y @@ -7325,7 +7327,6 @@ CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y # CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_SPLIT is not set # CONFIG_DEBUG_INFO_BTF is not set -CONFIG_PAHOLE_HAS_SPLIT_BTF=y # CONFIG_GDB_SCRIPTS is not set CONFIG_FRAME_WARN=2048 # CONFIG_STRIP_ASM_SYMS is not set From 2489c901bf7d557d63832a94a6054a5604635f25 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 2 Dec 2022 10:57:29 +0000 Subject: [PATCH 04/12] linux (Rockchip RK3328): update .config for 6.0.11 --- .../Rockchip/devices/RK3328/linux/default/linux.aarch64.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf b/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf index a2e4f685af..41b30047e3 100644 --- a/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf +++ b/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.0.3-rc1 Kernel Configuration +# Linux/arm64 6.0.11 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-none-elf-gcc-12.2.0 (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -12,6 +12,7 @@ CONFIG_LD_IS_BFD=y CONFIG_LD_VERSION=23900 CONFIG_LLD_VERSION=0 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y +CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0 @@ -973,6 +974,7 @@ CONFIG_NET_FOU=m # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set +CONFIG_INET_TABLE_PERTURB_ORDER=16 CONFIG_INET_TUNNEL=m CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y From 47dd9feefbea65b9b3a11245d545816580baa872 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 2 Dec 2022 10:57:29 +0000 Subject: [PATCH 05/12] linux (Rockchip RK3288): update .config for 6.0.11 --- projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf b/projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf index 756f6b441d..59d098e331 100644 --- a/projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf +++ b/projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.0.3-rc1 Kernel Configuration +# Linux/arm 6.0.11 Kernel Configuration # CONFIG_CC_VERSION_TEXT="armv7ve-libreelec-linux-gnueabihf-gcc-12.2.0 (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -14,6 +14,7 @@ CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y +CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0 @@ -894,6 +895,7 @@ CONFIG_NET_FOU=m # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set +CONFIG_INET_TABLE_PERTURB_ORDER=16 CONFIG_INET_TUNNEL=y CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y From 72e3d0a2782b11c19821a7ea8fabe562b1f6278f Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 2 Dec 2022 10:57:29 +0000 Subject: [PATCH 06/12] linux (Qualcomm): update .config for 6.0.11 --- .../Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf b/projects/Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf index ee933faf26..e84f7a7a79 100644 --- a/projects/Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf +++ b/projects/Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.0.3-rc1 Kernel Configuration +# Linux/arm64 6.0.11 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-none-elf-gcc-12.2.0 (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -12,6 +12,7 @@ CONFIG_LD_IS_BFD=y CONFIG_LD_VERSION=23900 CONFIG_LLD_VERSION=0 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y +CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0 @@ -962,6 +963,7 @@ CONFIG_NET_FOU=m # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set +CONFIG_INET_TABLE_PERTURB_ORDER=16 CONFIG_INET_TUNNEL=y CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y From 3d2fa4e95433cbb737bb25e2ace57ba74c27eebc Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 2 Dec 2022 10:57:29 +0000 Subject: [PATCH 07/12] linux (NXP iMX8): update .config for 6.0.11 --- projects/NXP/devices/iMX8/linux/linux.aarch64.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/NXP/devices/iMX8/linux/linux.aarch64.conf b/projects/NXP/devices/iMX8/linux/linux.aarch64.conf index f8fa6ad7a5..2311f9487c 100644 --- a/projects/NXP/devices/iMX8/linux/linux.aarch64.conf +++ b/projects/NXP/devices/iMX8/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.0.3-rc1 Kernel Configuration +# Linux/arm64 6.0.11 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-none-elf-gcc-12.2.0 (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -12,6 +12,7 @@ CONFIG_LD_IS_BFD=y CONFIG_LD_VERSION=23900 CONFIG_LLD_VERSION=0 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y +CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0 @@ -966,6 +967,7 @@ CONFIG_NET_FOU=m # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set +CONFIG_INET_TABLE_PERTURB_ORDER=16 CONFIG_INET_TUNNEL=m CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y From 81e34946f3da24ad0c3d0fc5bce27e2befc2f8ca Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 2 Dec 2022 10:57:29 +0000 Subject: [PATCH 08/12] linux (NXP iMX6): update .config for 6.0.11 --- projects/NXP/devices/iMX6/linux/linux.arm.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/NXP/devices/iMX6/linux/linux.arm.conf b/projects/NXP/devices/iMX6/linux/linux.arm.conf index 47782525af..aafde7c10b 100644 --- a/projects/NXP/devices/iMX6/linux/linux.arm.conf +++ b/projects/NXP/devices/iMX6/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.0.3-rc1 Kernel Configuration +# Linux/arm 6.0.11 Kernel Configuration # CONFIG_CC_VERSION_TEXT="armv7a-libreelec-linux-gnueabihf-gcc-12.2.0 (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -14,6 +14,7 @@ CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y +CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0 @@ -866,6 +867,7 @@ CONFIG_NET_FOU=m # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set +CONFIG_INET_TABLE_PERTURB_ORDER=16 CONFIG_INET_TUNNEL=y CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y From eb394a787566353c5e8d048fb44cc734ab2a8c03 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 2 Dec 2022 10:57:29 +0000 Subject: [PATCH 09/12] linux (Generic): update .config for 6.0.11 --- projects/Generic/linux/linux.x86_64.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index cc8ab183e5..9a76d687f3 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.0.3-rc1 Kernel Configuration +# Linux/x86 6.0.11 Kernel Configuration # CONFIG_CC_VERSION_TEXT="x86_64-libreelec-linux-gnu-gcc-12.2.0 (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -14,6 +14,7 @@ CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y +CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0 @@ -1011,6 +1012,7 @@ CONFIG_NET_FOU=m # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set +CONFIG_INET_TABLE_PERTURB_ORDER=16 CONFIG_INET_TUNNEL=m # CONFIG_INET_DIAG is not set CONFIG_TCP_CONG_ADVANCED=y From 0499bb7d9ca0a1889a1d2b36d6bc45f745a42392 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 2 Dec 2022 10:57:29 +0000 Subject: [PATCH 10/12] linux (Allwinner arm): update .config for 6.0.11 --- projects/Allwinner/linux/linux.arm.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/Allwinner/linux/linux.arm.conf b/projects/Allwinner/linux/linux.arm.conf index 43a6c66c49..fd5527fb99 100644 --- a/projects/Allwinner/linux/linux.arm.conf +++ b/projects/Allwinner/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.0.3-rc1 Kernel Configuration +# Linux/arm 6.0.11 Kernel Configuration # CONFIG_CC_VERSION_TEXT="armv7ve-libreelec-linux-gnueabihf-gcc-12.2.0 (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -14,6 +14,7 @@ CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y +CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0 @@ -891,6 +892,7 @@ CONFIG_INET_ESP=m # CONFIG_INET_ESP_OFFLOAD is not set # CONFIG_INET_ESPINTCP is not set # CONFIG_INET_IPCOMP is not set +CONFIG_INET_TABLE_PERTURB_ORDER=16 CONFIG_INET_TUNNEL=y # CONFIG_INET_DIAG is not set # CONFIG_TCP_CONG_ADVANCED is not set From 64ea2b6a06fff36a5e63a75f1fd3684e56f1a9ff Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 2 Dec 2022 10:57:29 +0000 Subject: [PATCH 11/12] linux (Allwinner aarch64): update .config for 6.0.11 --- projects/Allwinner/linux/linux.aarch64.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/Allwinner/linux/linux.aarch64.conf b/projects/Allwinner/linux/linux.aarch64.conf index f616325ce7..21ad80c4cc 100644 --- a/projects/Allwinner/linux/linux.aarch64.conf +++ b/projects/Allwinner/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.0.3-rc1 Kernel Configuration +# Linux/arm64 6.0.11 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-none-elf-gcc-12.2.0 (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -12,6 +12,7 @@ CONFIG_LD_IS_BFD=y CONFIG_LD_VERSION=23900 CONFIG_LLD_VERSION=0 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y +CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0 @@ -935,6 +936,7 @@ CONFIG_INET_ESP=y # CONFIG_INET_ESP_OFFLOAD is not set # CONFIG_INET_ESPINTCP is not set # CONFIG_INET_IPCOMP is not set +CONFIG_INET_TABLE_PERTURB_ORDER=16 CONFIG_INET_TUNNEL=y CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y From 918844a388a831f5c9ce1966fb41ae19c6e1725b Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 3 Dec 2022 01:10:25 +0000 Subject: [PATCH 12/12] linux: update to 6.0.11 --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 78133b1075..a9517f023a 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -28,8 +28,8 @@ case "${LINUX}" in PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; *) - PKG_VERSION="6.0.10" - PKG_SHA256="39e57fcd84cd70bfa3e1a4185d3aa0ed7f1432f24c6548d16326b0c3c9541dd0" + PKG_VERSION="6.0.11" + PKG_SHA256="2bae6131e64971e1e34ff395fa542971134c857bdb0b29069ab847c7c9a9c762" PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_PATCH_DIRS="default" ;;