diff options
| -rw-r--r-- | recipes-graphics/cairo/cairo_%.bbappend | 3 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-imx-headers_6.1.bb | 4 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-imx_6.1.bb | 6 |
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 @@ | |||
| 1 | PACKAGECONFIG:append:imxgpu3d = " egl glesv2" | ||
| 2 | PACKAGECONFIG: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 |
| 6 | LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined" | 3 | LDFLAGS: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 | ||
| 10 | SRC_URI = "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" | 10 | SRC_URI = "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" |
| 11 | SRCBRANCH = "lf-6.1.y" | 11 | SRCBRANCH = "lf-6.1.y" |
| 12 | LOCALVERSION = "-6.1.36-2.1.0" | 12 | LOCALVERSION = "-6.1.55-2.2.0" |
| 13 | SRCREV = "04b05c5527e9af8d81254638c307df07dc9a5dd3" | 13 | SRCREV = "770c5fe2c1d1529fae21b7043911cd50c6cf087e" |
| 14 | 14 | ||
| 15 | S = "${WORKDIR}/git" | 15 | S = "${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 | |||
| 15 | KERNEL_DEVICETREE_32BIT_COMPATIBILITY_UPDATE = "1" | 15 | KERNEL_DEVICETREE_32BIT_COMPATIBILITY_UPDATE = "1" |
| 16 | 16 | ||
| 17 | SRCBRANCH = "lf-6.1.y" | 17 | SRCBRANCH = "lf-6.1.y" |
| 18 | LOCALVERSION = "-6.1.36-2.1.0" | 18 | LOCALVERSION = "-6.1.55-2.2.0" |
| 19 | SRCREV = "04b05c5527e9af8d81254638c307df07dc9a5dd3" | 19 | SRCREV = "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. |
| 26 | LINUX_VERSION = "6.1.36" | 26 | LINUX_VERSION = "6.1.55" |
| 27 | 27 | ||
| 28 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" | 28 | KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" |
| 29 | KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" | 29 | KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" |
