From 68d3cd6bee325d72caba31a06a067d5ddb99ecb0 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Thu, 4 Mar 2021 10:22:45 +0000 Subject: [PATCH 1/9] linux (Rockchip): Remove patches included in 5.10.20 --- .../default/linux-1003-for-libreelec.patch | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/projects/Rockchip/patches/linux/default/linux-1003-for-libreelec.patch b/projects/Rockchip/patches/linux/default/linux-1003-for-libreelec.patch index c759418b1a..07d6325c26 100644 --- a/projects/Rockchip/patches/linux/default/linux-1003-for-libreelec.patch +++ b/projects/Rockchip/patches/linux/default/linux-1003-for-libreelec.patch @@ -530,32 +530,6 @@ index 58097245994a..0da80295f09f 100644 }; From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Aditya Prayoga -Date: Tue, 15 Sep 2020 13:29:45 +0700 -Subject: [PATCH] PCI: rockchip: support ep-gpio undefined case - -Signed-off-by: Aditya Prayoga ---- - drivers/pci/controller/pcie-rockchip.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c -index 904dec0d3a88..13b0d30b130d 100644 ---- a/drivers/pci/controller/pcie-rockchip.c -+++ b/drivers/pci/controller/pcie-rockchip.c -@@ -118,9 +118,9 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) - } - - if (rockchip->is_rc) { -- rockchip->ep_gpio = devm_gpiod_get(dev, "ep", GPIOD_OUT_HIGH); -+ rockchip->ep_gpio = devm_gpiod_get_optional(dev, "ep", GPIOD_OUT_HIGH); - if (IS_ERR(rockchip->ep_gpio)) { -- dev_err(dev, "missing ep-gpios property in node\n"); -+ dev_err(dev, "invalid ep-gpios property in node\n"); - return PTR_ERR(rockchip->ep_gpio); - } - } -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Sat, 27 Feb 2021 17:52:02 +0100 Subject: [PATCH] ARM64: dts: rockchip: add SPDIF nodes for RK3328 A1/ROC CC From 9a6832e55b0c5f54dd254f72ac86eb9c4c3f8e8d Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sat, 6 Mar 2021 12:50:08 +0000 Subject: [PATCH 2/9] linux (Generic): update linux.x86_64.conf with CONFIG_KCMP=y Update to the .config in 5.10.20 ref: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/commit/?h=linux-5.10.y&id=1ea36020950d44ef9152d832887a0c1cee0edee2 --- projects/Generic/linux/linux.x86_64.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 924c828e81..5d22b48592 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 5.10.17 Kernel Configuration +# Linux/x86 5.10.20 Kernel Configuration # CONFIG_CC_VERSION_TEXT="x86_64-libreelec-linux-gnu-gcc-10.2.0 (GCC) 10.2.0" CONFIG_CC_IS_GCC=y @@ -236,6 +236,7 @@ CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y # CONFIG_BPF_PRELOAD is not set # CONFIG_USERFAULTFD is not set CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_KCMP=y CONFIG_RSEQ=y # CONFIG_DEBUG_RSEQ is not set # CONFIG_EMBEDDED is not set From 03948518484d0ad8a522571b732992f0e3121e4d Mon Sep 17 00:00:00 2001 From: heitbaum Date: Fri, 26 Feb 2021 10:20:36 +0000 Subject: [PATCH 3/9] linux: update to 5.10.21 --- 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 f5cc93e93d..5aa68e88db 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="5.10.17" - PKG_SHA256="e84e623ce8bb2446ec026b62eafa3b18480aa6fb6ae9c86cd8f18651324d4814" + PKG_VERSION="5.10.21" + PKG_SHA256="9e7fe6ff1665bb578e8a88e761f6727b7f170a81563b93c1d49bd0bb7d7de2af" PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_PATCH_DIRS="default" ;; From 599041a0b293debaa644676b16d06343d7090563 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Mon, 8 Mar 2021 04:19:10 +0000 Subject: [PATCH 4/9] linux (Allwinner): update linux.aarch64.conf with CONFIG_KCMP=y --- projects/Allwinner/linux/linux.aarch64.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/Allwinner/linux/linux.aarch64.conf b/projects/Allwinner/linux/linux.aarch64.conf index 330dd6e642..3d2c0c5719 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 5.10.17 Kernel Configuration +# Linux/arm64 5.10.21 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc.real (GNU Toolchain for the A-profile Architecture 10.2-2020.11 (arm-10.16)) 10.2.1 20201103" CONFIG_CC_IS_GCC=y @@ -226,6 +226,7 @@ CONFIG_BPF_JIT_DEFAULT_ON=y # CONFIG_BPF_PRELOAD is not set # CONFIG_USERFAULTFD is not set CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_KCMP=y CONFIG_RSEQ=y # CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y @@ -5515,7 +5516,6 @@ CONFIG_RESET_SUNXI=y # CONFIG_GENERIC_PHY=y CONFIG_PHY_XGENE=y -# CONFIG_USB_LGM_PHY is not set CONFIG_PHY_SUN4I_USB=y # CONFIG_PHY_SUN6I_MIPI_DPHY is not set # CONFIG_PHY_SUN9I_USB is not set From c0946cca9bfe63fb6f1c6fa4791a389490ea9578 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Mon, 8 Mar 2021 04:19:51 +0000 Subject: [PATCH 5/9] linux (iMX8): update linux.aarch64.conf with CONFIG_KCMP=y --- projects/NXP/devices/iMX8/linux/linux.aarch64.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/NXP/devices/iMX8/linux/linux.aarch64.conf b/projects/NXP/devices/iMX8/linux/linux.aarch64.conf index 127d63a0b0..79f4d57018 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 5.10.12 Kernel Configuration +# Linux/arm64 5.10.21 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc.real (GNU Toolchain for the A-profile Architecture 10.2-2020.11 (arm-10.16)) 10.2.1 20201103" CONFIG_CC_IS_GCC=y @@ -207,6 +207,7 @@ CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y # CONFIG_BPF_PRELOAD is not set # CONFIG_USERFAULTFD is not set CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_KCMP=y CONFIG_RSEQ=y # CONFIG_DEBUG_RSEQ is not set CONFIG_EMBEDDED=y @@ -5379,7 +5380,6 @@ CONFIG_RESET_IMX7=y # CONFIG_GENERIC_PHY=y # CONFIG_PHY_XGENE is not set -# CONFIG_USB_LGM_PHY is not set # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_PHY_CADENCE_TORRENT is not set # CONFIG_PHY_CADENCE_DPHY is not set From ae1554eb65b4eef34081292f7619414be67c4075 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Mon, 8 Mar 2021 04:21:04 +0000 Subject: [PATCH 6/9] linux (Rockchip: RK3399): update linux.aarch64.conf with CONFIG_KCMP=y --- .../Rockchip/devices/RK3399/linux/default/linux.aarch64.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf b/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf index 817711b44a..a6544f0054 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 5.10.17 Kernel Configuration +# Linux/arm64 5.10.21 Kernel Configuration # # @@ -206,6 +206,7 @@ CONFIG_BPF_JIT_DEFAULT_ON=y # CONFIG_BPF_PRELOAD is not set # CONFIG_USERFAULTFD is not set CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_KCMP=y CONFIG_RSEQ=y # CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y @@ -5868,7 +5869,6 @@ CONFIG_RESET_CONTROLLER=y # CONFIG_GENERIC_PHY=y # CONFIG_PHY_XGENE is not set -# CONFIG_USB_LGM_PHY is not set # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_PHY_CADENCE_TORRENT is not set # CONFIG_PHY_CADENCE_DPHY is not set From dd5c250b2b9890eff72d349f9e91de6310194674 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Mon, 8 Mar 2021 04:59:15 +0000 Subject: [PATCH 7/9] linux (iMX6): update linux.arm.conf with CONFIG_KCMP=y --- projects/NXP/devices/iMX6/linux/linux.arm.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/NXP/devices/iMX6/linux/linux.arm.conf b/projects/NXP/devices/iMX6/linux/linux.arm.conf index c2ef46e4ce..8aa4a606b1 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 5.10.17 Kernel Configuration +# Linux/arm 5.10.21 Kernel Configuration # CONFIG_CC_VERSION_TEXT="armv7a-libreelec-linux-gnueabihf-gcc-10.2.0 (GCC) 10.2.0" CONFIG_CC_IS_GCC=y @@ -199,6 +199,7 @@ CONFIG_BPF_SYSCALL=y # CONFIG_BPF_PRELOAD is not set # CONFIG_USERFAULTFD is not set CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_KCMP=y CONFIG_RSEQ=y # CONFIG_DEBUG_RSEQ is not set # CONFIG_EMBEDDED is not set @@ -5767,7 +5768,6 @@ CONFIG_RESET_CONTROLLER=y # PHY Subsystem # # CONFIG_GENERIC_PHY is not set -# CONFIG_USB_LGM_PHY is not set # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_PHY_CADENCE_TORRENT is not set # CONFIG_PHY_CADENCE_DPHY is not set @@ -6295,7 +6295,7 @@ CONFIG_CRYPTO_DEV_SAHARA=y CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y CONFIG_X509_CERTIFICATE_PARSER=y -CONFIG_PKCS8_PRIVATE_KEY_PARSER=y +CONFIG_PKCS8_PRIVATE_KEY_PARSER=m CONFIG_PKCS7_MESSAGE_PARSER=y # CONFIG_PKCS7_TEST_KEY is not set # CONFIG_SIGNED_PE_FILE_VERIFICATION is not set From 0405f7d8c036b9504372e1b817214b5fb9930522 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Mon, 8 Mar 2021 05:57:43 +0000 Subject: [PATCH 8/9] linux (Rockchip: RK3288): update linux.arm.conf with CONFIG_KCMP=y --- projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf b/projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf index 853611a899..e3a5ec2edb 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 5.10.17 Kernel Configuration +# Linux/arm 5.10.21 Kernel Configuration # # @@ -202,6 +202,7 @@ CONFIG_BPF_SYSCALL=y # CONFIG_BPF_PRELOAD is not set # CONFIG_USERFAULTFD is not set CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_KCMP=y CONFIG_RSEQ=y # CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y @@ -5226,7 +5227,6 @@ CONFIG_RESET_SCMI=y # PHY Subsystem # CONFIG_GENERIC_PHY=y -# CONFIG_USB_LGM_PHY is not set # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_PHY_CADENCE_TORRENT is not set # CONFIG_PHY_CADENCE_DPHY is not set From f0e8ff199ef085a28f28a2e03d912732027d8b5c Mon Sep 17 00:00:00 2001 From: heitbaum Date: Mon, 8 Mar 2021 06:00:50 +0000 Subject: [PATCH 9/9] linux (Rockchip: RK3328): update linux.aarch64.conf with CONFIG_KCMP=y --- .../Rockchip/devices/RK3328/linux/default/linux.aarch64.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf b/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf index 117b63699d..b4eb873610 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 5.10.17 Kernel Configuration +# Linux/arm64 5.10.21 Kernel Configuration # # @@ -206,6 +206,7 @@ CONFIG_BPF_JIT_DEFAULT_ON=y # CONFIG_BPF_PRELOAD is not set # CONFIG_USERFAULTFD is not set CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_KCMP=y CONFIG_RSEQ=y # CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y @@ -5187,7 +5188,6 @@ CONFIG_RESET_CONTROLLER=y # CONFIG_GENERIC_PHY=y # CONFIG_PHY_XGENE is not set -# CONFIG_USB_LGM_PHY is not set # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_PHY_CADENCE_TORRENT is not set # CONFIG_PHY_CADENCE_DPHY is not set