summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-graphics/cairo/cairo_%.bbappend3
-rw-r--r--recipes-kernel/linux/linux-imx-headers_6.1.bb4
-rw-r--r--recipes-kernel/linux/linux-imx_6.1.bb6
3 files changed, 5 insertions, 8 deletions
diff --git a/recipes-graphics/cairo/cairo_%.bbappend b/recipes-graphics/cairo/cairo_%.bbappend
index c61e9a589..bf8c38fc3 100644
--- a/recipes-graphics/cairo/cairo_%.bbappend
+++ b/recipes-graphics/cairo/cairo_%.bbappend
@@ -1,6 +1,3 @@
1PACKAGECONFIG:append:imxgpu3d = " egl glesv2"
2PACKAGECONFIG:remove:imxgpu3d = "opengl"
3
4# links with imx-gpu libs which are pre-built for glibc 1# links with imx-gpu libs which are pre-built for glibc
5# gcompat will address it during runtime 2# gcompat will address it during runtime
6LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined" 3LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined"
diff --git a/recipes-kernel/linux/linux-imx-headers_6.1.bb b/recipes-kernel/linux/linux-imx-headers_6.1.bb
index 570e0f4e4..e2e63efca 100644
--- a/recipes-kernel/linux/linux-imx-headers_6.1.bb
+++ b/recipes-kernel/linux/linux-imx-headers_6.1.bb
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
9 9
10SRC_URI = "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" 10SRC_URI = "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
11SRCBRANCH = "lf-6.1.y" 11SRCBRANCH = "lf-6.1.y"
12LOCALVERSION = "-6.1.36-2.1.0" 12LOCALVERSION = "-6.1.55-2.2.0"
13SRCREV = "04b05c5527e9af8d81254638c307df07dc9a5dd3" 13SRCREV = "770c5fe2c1d1529fae21b7043911cd50c6cf087e"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
diff --git a/recipes-kernel/linux/linux-imx_6.1.bb b/recipes-kernel/linux/linux-imx_6.1.bb
index 9e5fa2b0a..6b93a1d08 100644
--- a/recipes-kernel/linux/linux-imx_6.1.bb
+++ b/recipes-kernel/linux/linux-imx_6.1.bb
@@ -15,15 +15,15 @@ require recipes-kernel/linux/linux-imx.inc
15KERNEL_DEVICETREE_32BIT_COMPATIBILITY_UPDATE = "1" 15KERNEL_DEVICETREE_32BIT_COMPATIBILITY_UPDATE = "1"
16 16
17SRCBRANCH = "lf-6.1.y" 17SRCBRANCH = "lf-6.1.y"
18LOCALVERSION = "-6.1.36-2.1.0" 18LOCALVERSION = "-6.1.55-2.2.0"
19SRCREV = "04b05c5527e9af8d81254638c307df07dc9a5dd3" 19SRCREV = "770c5fe2c1d1529fae21b7043911cd50c6cf087e"
20 20
21# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition 21# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
22# required by kernel-yocto.bbclass. 22# required by kernel-yocto.bbclass.
23# 23#
24# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and 24# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
25# should be updated once patchlevel is merged. 25# should be updated once patchlevel is merged.
26LINUX_VERSION = "6.1.36" 26LINUX_VERSION = "6.1.55"
27 27
28KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" 28KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
29KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" 29KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"