linux-qoriq: upgrade to 5.10

Signed-off-by: Ting Liu <ting.liu@nxp.com>

diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
index edac105508d7b5438f7416b4b5beeb7fa9e0dc77..cd474aed6e109876a96b0c109a4646cef645ac1f 100644 (file)
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -25,8 +25,7 @@ SCMVERSION ?= "y"
 LOCALVERSION = ""
 DELTA_KERNEL_DEFCONFIG ?= ""
 DELTA_KERNEL_DEFCONFIG:prepend:qoriq-arm64 = "lsdk.config "
-DELTA_KERNEL_DEFCONFIG:prepend:fsl-lsch2-32b = "multi_v7_lpae.config multi_v8.config lsdk.config "
-DELTA_KERNEL_DEFCONFIG:prepend:ls102xa = "multi_v7_lpae.config lsdk.config "
+DELTA_KERNEL_DEFCONFIG:prepend:qoriq-arm = "multi_v7_lpae.config lsdk.config "
 
 do_merge_delta_config[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot bison-native:do_populate_sysroot"
 do_merge_delta_config[dirs] = "${B}"
@@ -55,14 +54,5 @@ do_merge_delta_config() {
 }
 addtask merge_delta_config before do_kernel_localversion after do_patch
 
-# The link of dts folder is needed for 32b compile of aarch64 targets(e.g. ls1043ardb-32b)
-do_compile:prepend:fsl-lsch2-32b() {
-    ln -sfT ${STAGING_KERNEL_DIR}/arch/arm64/boot/dts/freescale ${STAGING_KERNEL_DIR}/arch/arm/boot/dts/freescale
-}
-
-do_install:prepend:fsl-lsch2-32b() {
-    rm -f ${STAGING_KERNEL_DIR}/arch/arm/boot/dts/freescale
-}
-
 FILES:${KERNEL_PACKAGE_NAME}-image += "/boot/zImage*"
 COMPATIBLE_MACHINE = "(qoriq)"

diff --git a/recipes-kernel/linux/linux-qoriq_5.10.bb b/recipes-kernel/linux/linux-qoriq_5.10.bb
new file mode 100644 (file)
index 0000000..b5315c7
--- /dev/null
+++ b/recipes-kernel/linux/linux-qoriq_5.10.bb
@@ -0,0 +1,8 @@
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+
+LINUX_VERSION = "5.10.52"
+
+SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/linux;nobranch=1"
+SRCREV = "a11753a89ec610768301d4070e10b8bd60fde8cd"
+
+require recipes-kernel/linux/linux-qoriq.inc

diff --git a/recipes-kernel/linux/linux-qoriq_5.4.bb b/recipes-kernel/linux/linux-qoriq_5.4.bb
deleted file mode 100644 (file)
index 54fd700..0000000
--- a/recipes-kernel/linux/linux-qoriq_5.4.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-
-LINUX_VERSION = "5.4.47"
-
-SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/linux;nobranch=1 \
-    file://0001-Makfefile-linux-5.4-add-warning-cflags-on-LSDK-20.04.patch \
-    file://0001-perf-tests-bp_account-Make-global-variable-static.patch \
-    file://0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch \
-    file://0001-perf-bench-Share-some-global-variables-to-fix-build-.patch \
-    file://0001-libtraceevent-Fix-build-with-binutils-2.35.patch \
-"
-SRCREV = "6bff40d413b394c2d742e7a42089bfc62aef0a9b"
-
-require recipes-kernel/linux/linux-qoriq.inc