summaryrefslogtreecommitdiffstats
path: root/recipes-kernel
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/ceetm/ceetm_git.bb6
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-ar_git.bb2
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb2
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.0.bb (renamed from recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.4.bb)10
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-ipc.inc2
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.2.bb20
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.1.bb22
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb2
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-nxp-wlan/mlinux-moal_main-lower-PRINTM_MMSG-log-level-to-KERN_INFO.patch33
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb15
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb2
-rw-r--r--recipes-kernel/linux/linux-fslc-imx_6.12.bb (renamed from recipes-kernel/linux/linux-fslc-imx_6.6.bb)38
-rw-r--r--recipes-kernel/linux/linux-fslc-lts_6.1.bb4
-rw-r--r--recipes-kernel/linux/linux-fslc-lts_6.6.bb37
-rw-r--r--recipes-kernel/linux/linux-fslc_6.12.bb (renamed from recipes-kernel/linux/linux-fslc_6.6.bb)13
-rw-r--r--recipes-kernel/linux/linux-imx-headers/0001-video-fbdev-mxc-make-uapi-ipu.h-pxp_dma.h-compatible.patch54
-rw-r--r--recipes-kernel/linux/linux-imx-headers_6.12.bb (renamed from recipes-kernel/linux/linux-imx-headers_6.6.bb)24
-rw-r--r--recipes-kernel/linux/linux-imx.inc4
-rw-r--r--recipes-kernel/linux/linux-imx/0001-lib-build_OID_registry-don-t-mention-the-full-path-o.patch62
-rw-r--r--recipes-kernel/linux/linux-imx/0001-tty-vt-conmakehash-Don-t-mention-the-full-path-of-th.patch70
-rw-r--r--recipes-kernel/linux/linux-imx/0001-video-logo-Drop-full-path-of-the-input-filename-in-g.patch38
-rw-r--r--recipes-kernel/linux/linux-imx_6.12.bb (renamed from recipes-kernel/linux/linux-imx_6.6.bb)14
-rw-r--r--recipes-kernel/linux/linux-qoriq.inc8
-rw-r--r--recipes-kernel/skmm-host/skmm-host_git.bb4
24 files changed, 227 insertions, 259 deletions
diff --git a/recipes-kernel/ceetm/ceetm_git.bb b/recipes-kernel/ceetm/ceetm_git.bb
index 1059e0061..947a31280 100644
--- a/recipes-kernel/ceetm/ceetm_git.bb
+++ b/recipes-kernel/ceetm/ceetm_git.bb
@@ -9,11 +9,9 @@ SRC_URI:append = " file://0001-Makefile-update-CFLAGS.patch \
9" 9"
10DEPENDS = "iproute2" 10DEPENDS = "iproute2"
11 11
12S = "${WORKDIR}/git" 12export IPROUTE2_DIR = "${STAGING_DIR_TARGET}"
13
14export IPROUTE2_DIR="${STAGING_DIR_TARGET}"
15WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}" 13WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
16export CROSS_COMPILE="${WRAP_TARGET_PREFIX}" 14export CROSS_COMPILE = "${WRAP_TARGET_PREFIX}"
17 15
18LDFLAGS += "${TOOLCHAIN_OPTIONS}" 16LDFLAGS += "${TOOLCHAIN_OPTIONS}"
19 17
diff --git a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
index 553e2013c..054cb1fb9 100644
--- a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
@@ -7,8 +7,6 @@ inherit module
7SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/auto-resp;branch=nxp/sdk-v2.0.x;protocol=https" 7SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/auto-resp;branch=nxp/sdk-v2.0.x;protocol=https"
8SRCREV = "9a74743167dcfcfbca5056eedbff9a52337c9712" 8SRCREV = "9a74743167dcfcfbca5056eedbff9a52337c9712"
9 9
10S = "${WORKDIR}/git"
11
12EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} SYSROOT=${STAGING_DIR_TARGET}" 10EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} SYSROOT=${STAGING_DIR_TARGET}"
13export KERNEL_PATH 11export KERNEL_PATH
14 12
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb
index 13793132a..053239365 100644
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb
@@ -12,8 +12,6 @@ PV .= "+git${SRCPV}"
12SRCREV = "4d035200e7b15d2713d49979a1d05f201b92cf4c" 12SRCREV = "4d035200e7b15d2713d49979a1d05f201b92cf4c"
13SRC_URI = "git://github.com/Freescale/kernel-module-imx-gpu-viv.git;protocol=https;branch=master" 13SRC_URI = "git://github.com/Freescale/kernel-module-imx-gpu-viv.git;protocol=https;branch=master"
14 14
15S = "${WORKDIR}/git"
16
17inherit module 15inherit module
18 16
19KERNEL_MODULE_AUTOLOAD = "galcore" 17KERNEL_MODULE_AUTOLOAD = "galcore"
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.4.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.0.bb
index e48d72585..f55ca7084 100644
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.4.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.0.bb
@@ -7,14 +7,14 @@ allowing flexibility to use a newer graphics release with an older kernel."
7LICENSE = "GPL-2.0-only" 7LICENSE = "GPL-2.0-only"
8LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" 8LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
9 9
10SRC_URI = "${KERNEL_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \ 10SRC_URI = "${KERNEL_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=${S}/src \
11 file://Add-makefile.patch" 11 file://Add-makefile.patch"
12KERNEL_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" 12KERNEL_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
13SRCBRANCH = "lf-6.6.y" 13SRCBRANCH = "lf-6.12.y"
14LOCALVERSION = "-6.6.3-1.0.0" 14LOCALVERSION = "-6.12.3-1.0.0"
15SRCREV = "3571388e9660f96b65b5fdcc093cc973ee502949" 15SRCREV = "d8c9f00d41b313a1ac122530524a62604c6871c9"
16 16
17S = "${WORKDIR}/git" 17S = "${UNPACKDIR}/${BP}"
18 18
19inherit module 19inherit module
20 20
diff --git a/recipes-kernel/kernel-modules/kernel-module-ipc.inc b/recipes-kernel/kernel-modules/kernel-module-ipc.inc
index d2316fe00..50d8cca62 100644
--- a/recipes-kernel/kernel-modules/kernel-module-ipc.inc
+++ b/recipes-kernel/kernel-modules/kernel-module-ipc.inc
@@ -8,8 +8,6 @@ inherit module qoriq_build_64bit_kernel
8SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/ipc;protocol=https;nobranch=1" 8SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/ipc;protocol=https;nobranch=1"
9SRCREV = "74d662707558290f070f9589177db730444bc435" 9SRCREV = "74d662707558290f070f9589177db730444bc435"
10 10
11S = "${WORKDIR}/git"
12
13do_configure[depends] += "virtual/kernel:do_shared_workdir" 11do_configure[depends] += "virtual/kernel:do_shared_workdir"
14do_compile:prepend () { 12do_compile:prepend () {
15 cd ${S}/kernel 13 cd ${S}/kernel
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.2.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.2.bb
deleted file mode 100644
index 55a4bedad..000000000
--- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.2.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1# Copyright 2020-2023 NXP
2
3DESCRIPTION = "Kernel loadable module for ISP"
4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44"
6
7SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}"
8ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https"
9SRCBRANCH = "lf-6.6.y_2.0.0"
10SRCREV = "ab77b0521615d3f279263ba67439aed887d525d7"
11
12S = "${WORKDIR}/git/vvcam/v4l2"
13
14inherit module
15
16DEBUG_PREFIX_MAP:prepend = " \
17 -fmacro-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
18 -fdebug-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} "
19
20COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.1.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.1.bb
new file mode 100644
index 000000000..62dd737cb
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.1.bb
@@ -0,0 +1,22 @@
1# Copyright (C) 2020-2023 NXP
2
3DESCRIPTION = "Kernel loadable module for ISP"
4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44"
6
7SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}"
8ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https"
9SRCBRANCH = "lf-6.12.y_1.0.0"
10SRCREV = "78d717bb22819df9d988ef1b4e3cca1acf61095d"
11
12S = "${UNPACKDIR}/${BP}/vvcam/v4l2"
13
14inherit module
15
16MODULES_MODULE_SYMVERS_LOCATION = "dwe"
17
18DEBUG_PREFIX_MAP:prepend = " \
19 -fmacro-prefix-map=${UNPACKDIR}/${BP}/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
20 -fdebug-prefix-map=${UNPACKDIR}/${BP}/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} "
21
22COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb b/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb
index ba1561618..9c5ce8f17 100644
--- a/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb
@@ -10,8 +10,6 @@ inherit module autotools-brokensep
10SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/ls-dbg;branch=nxp/master;protocol=https" 10SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/ls-dbg;branch=nxp/master;protocol=https"
11SRCREV = "40501f6659e880d38508cdd34a4df2d348d1c68e" 11SRCREV = "40501f6659e880d38508cdd34a4df2d348d1c68e"
12 12
13S = "${WORKDIR}/git"
14
15EXTRA_OECONF += "--with-linux=${STAGING_KERNEL_DIR}" 13EXTRA_OECONF += "--with-linux=${STAGING_KERNEL_DIR}"
16EXTRA_OEMAKE += 'SYSROOT="${D}"' 14EXTRA_OEMAKE += 'SYSROOT="${D}"'
17 15
diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan/mlinux-moal_main-lower-PRINTM_MMSG-log-level-to-KERN_INFO.patch b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan/mlinux-moal_main-lower-PRINTM_MMSG-log-level-to-KERN_INFO.patch
new file mode 100644
index 000000000..72e75fd57
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan/mlinux-moal_main-lower-PRINTM_MMSG-log-level-to-KERN_INFO.patch
@@ -0,0 +1,33 @@
1From f6079560bd0010a7f34bd18fec8fab4df65b22ea Mon Sep 17 00:00:00 2001
2From: Vitor Soares <vitor.soares@toradex.com>
3Date: Wed, 30 Apr 2025 15:12:06 +0100
4Subject: [PATCH] mlinux: moal_main: lower PRINTM_MMSG() log level to KERN_INFO
5
6Currently, the PRINTM_MMSG macro uses KERN_ALERT for printing messages.
7KERN_ALERT is intended for critical conditions requiring immediate
8attention (e.g., hardware failure), and using it for normal debug output
9is misleading and can clutter system logs.
10
11This patch lowers the log level to KERN_INFO, which is more appropriate
12for informational messages that are not indicative of system-critical
13failures.
14
15Upstream-Status: Inappropriate [upstream not accepting patches]
16Signed-off-by: Vitor Soares <vitor.soares@toradex.com>
17---
18 mlinux/moal_main.h | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/mlinux/moal_main.h b/mlinux/moal_main.h
22index 4328652..27121e0 100644
23--- a/mlinux/moal_main.h
24+++ b/mlinux/moal_main.h
25@@ -3529,7 +3529,7 @@ extern t_u32 drvdbg;
26 do { \
27 woal_print(MMSG, msg); \
28 if (drvdbg & MMSG) \
29- printk(KERN_ALERT msg); \
30+ printk(KERN_INFO msg); \
31 } while (0)
32
33 static inline void woal_print(t_u32 level, char *fmt, ...)
diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
index 453fdd48c..70386dc0d 100644
--- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
@@ -1,4 +1,4 @@
1SUMMARY = "NXP Wi-Fi driver for module 88w8801/8987/8997/9098 IW416/612" 1SUMMARY = "NXP Wi-Fi driver for module 88w8801/8987/8997/9098 IW416/610/612"
2LICENSE = "GPL-2.0-only" 2LICENSE = "GPL-2.0-only"
3LIC_FILES_CHKSUM = "file://LICENSE;md5=ab04ac0f249af12befccb94447c08b77" 3LIC_FILES_CHKSUM = "file://LICENSE;md5=ab04ac0f249af12befccb94447c08b77"
4 4
@@ -8,15 +8,14 @@ RREPLACES:${PN} = "kernel-module-nxp89xx"
8RPROVIDES:${PN} = "kernel-module-nxp89xx" 8RPROVIDES:${PN} = "kernel-module-nxp89xx"
9RCONFLICTS:${PN} = "kernel-module-nxp89xx" 9RCONFLICTS:${PN} = "kernel-module-nxp89xx"
10 10
11SRCBRANCH = "lf-6.6.23_2.0.0" 11SRCBRANCH = "lf-6.12.3_1.0.0"
12MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https" 12MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https"
13SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH}" 13SRC_URI = " \
14SRCREV = "88372772badbf30152b3ad12ae251dc567095cab" 14 ${MRVL_SRC};branch=${SRCBRANCH} \
15 15 file://mlinux-moal_main-lower-PRINTM_MMSG-log-level-to-KERN_INFO.patch \
16S = "${WORKDIR}/git" 16"
17SRCREV = "0396cfb38ad73a3d587cd0f8c139b47801e70891"
17 18
18inherit module 19inherit module
19 20
20EXTRA_OEMAKE = "KERNELDIR=${STAGING_KERNEL_BUILDDIR} -C ${STAGING_KERNEL_BUILDDIR} M=${S}" 21EXTRA_OEMAKE = "KERNELDIR=${STAGING_KERNEL_BUILDDIR} -C ${STAGING_KERNEL_BUILDDIR} M=${S}"
21
22COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb b/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb
index efccc286d..e7ae8556e 100644
--- a/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb
@@ -7,6 +7,6 @@ SRCREV = "0f31fbcbe9ab1ab9c424da34f70c82314b16f8de"
7 7
8inherit module 8inherit module
9 9
10S = "${WORKDIR}/git/uio-driver" 10S = "${UNPACKDIR}/${BP}/uio-driver"
11 11
12COMPATIBLE_MACHINE = "(t1040|t1042)" 12COMPATIBLE_MACHINE = "(t1040|t1042)"
diff --git a/recipes-kernel/linux/linux-fslc-imx_6.6.bb b/recipes-kernel/linux/linux-fslc-imx_6.12.bb
index 4810ca11f..ef87e8146 100644
--- a/recipes-kernel/linux/linux-fslc-imx_6.6.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_6.12.bb
@@ -28,20 +28,38 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
28# ------------------------------------------------------------------------------ 28# ------------------------------------------------------------------------------
29# 1. Stable (tag or SHA(s)) 29# 1. Stable (tag or SHA(s))
30# ------------------------------------------------------------------------------ 30# ------------------------------------------------------------------------------
31# tag: v6.6.23 31# tag: v6.12.3
32# 32#
33# ------------------------------------------------------------------------------ 33# ------------------------------------------------------------------------------
34# 2. NXP-specific (tag or SHA(s)) 34# 2. NXP-specific (tag or SHA(s))
35# ------------------------------------------------------------------------------ 35# ------------------------------------------------------------------------------
36# tag: lf-6.6.3-1.0.00 36# tag: lf-6.12.3-1.0.0
37# 37#
38# ------------------------------------------------------------------------------ 38# ------------------------------------------------------------------------------
39# 3. Critical patches (SHA(s)) 39# 3. Critical patches (SHA(s))
40# ------------------------------------------------------------------------------ 40# ------------------------------------------------------------------------------
41# - f67cb9a5b4fb7 Revert "net: stmmac: fix FPE events losing" 41# The list includes well-known commits not yet upstreamed. Reverts address merge
42# - 1918c2eb8b07f Revert "dmaengine: fsl-edma: fix DMA channel leak in eDMAv4" 42# conflicts, prioritizing NXP BSP source code as the latest vendor updates.
43# - 42289407ee38f Revert "dmaengine: fsl-edma: Add judgment on enabling round robin arbitration" 43# Additional commits may exist to better acommodate yocto builds.
44# - 952f79923f055 Revert "dmaengine: fsl-edma: Do not suspend and resume the masked dma channel when the system is sleeping" 44#
45# $ git log --oneline --no-merges v6.12.34.. ^mainline/linux-6.12.y ^NXP/lf-6.12.y
46# - 8d94e52076a1 Revert "firmware: arm_scmi: Fix i.MX build dependency"
47# - adefe4ecd9c6 Revert "PCI: imx6: Fix suspend/resume support on i.MX6QDL"
48# - 2837cecae149 imx8mp-olimex.dts: CSI GPIO pins
49# - 29efe53139ac hwrng: optee: support generic crypto
50# - 7f80ce9b7c82 arm64: dts: imx8mq: drop cpu-idle-states
51# - 5e3b6ecf85c4 of: enable using OF_DYNAMIC without OF_UNITTEST
52# - 1bd794e571f6 gpu: drm: cadence: select hdmi helper
53# - d74361dc9bdc imx:dts:imx8mm-evkb: fix the pmic name to avoid duplicated label error
54# - 90900e871607 arm64: dts: imx8mm-evk-qca-wifi: enable support for bluetooth
55# - 24ef2924dd5f drm: of: Fix build without CONFIG_OF
56# - a97fe216ede5 i2c: imx: Remove unnecessary clock reconfiguration
57# - 93e7f87e7bc6 drm/imx: lcdifv3: Fix videomode settings
58# - ff2397021b0d clk: imx: imx8qm: add more resources to whitelist
59# - e0fc64f7a2f8 arm64: dts: imx8: img: add #address-cells and #size-cells to I2C MIPI CSI nodes
60# - 98b777bfa849 arm64: dts: imx8qm: add missing imx8-ss-cm40.dtsi include
61# - 2d0aefc287a7 arm64: imx_v8_defconfig: Enable CONFIG_GPIO_VF610
62# - 44aadbd00c61 imx8mp-olimex.dts: Olimex iMX8MP-SOM-EVB-IND
45# 63#
46# NOTE to upgraders: 64# NOTE to upgraders:
47# This recipe should NOT collect individual patches, they should be applied to 65# This recipe should NOT collect individual patches, they should be applied to
@@ -51,16 +69,16 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
51 69
52require linux-imx.inc 70require linux-imx.inc
53 71
54KBRANCH = "6.6-2.0.x-imx" 72KBRANCH = "6.12-1.0.x-imx"
55SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" 73SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https"
56SRCREV = "dd280fd310dd5fabbff7393175ee9d7a6aea6b34" 74SRCREV = "c63da44a120c9ad720877a74f0c94e2d9b08cab1"
57 75
58# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition 76# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
59# required by kernel-yocto.bbclass. 77# required by kernel-yocto.bbclass.
60# 78#
61# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and 79# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
62# should be updated once patchlevel is merged. 80# should be updated once patchlevel is merged.
63LINUX_VERSION = "6.6.23" 81LINUX_VERSION = "6.12.34"
64 82
65KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" 83KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
66KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" 84KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"
@@ -68,7 +86,7 @@ KBUILD_DEFCONFIG:mx8-generic-bsp = "imx_v8_defconfig"
68KBUILD_DEFCONFIG:mx9-generic-bsp = "imx_v8_defconfig" 86KBUILD_DEFCONFIG:mx9-generic-bsp = "imx_v8_defconfig"
69 87
70# Local version indicates the branch name in the NXP kernel tree where patches are collected from. 88# Local version indicates the branch name in the NXP kernel tree where patches are collected from.
71LOCALVERSION = "-lf-6.6.y" 89LOCALVERSION = "-lf-6.12.y"
72 90
73DEFAULT_PREFERENCE = "1" 91DEFAULT_PREFERENCE = "1"
74 92
diff --git a/recipes-kernel/linux/linux-fslc-lts_6.1.bb b/recipes-kernel/linux/linux-fslc-lts_6.1.bb
index 8e1bab4be..ae1e71b18 100644
--- a/recipes-kernel/linux/linux-fslc-lts_6.1.bb
+++ b/recipes-kernel/linux/linux-fslc-lts_6.1.bb
@@ -21,10 +21,10 @@ SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=
21# 21#
22# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and 22# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
23# should be updated once patchlevel is merged. 23# should be updated once patchlevel is merged.
24LINUX_VERSION = "6.1.72" 24LINUX_VERSION = "6.1.111"
25 25
26KBRANCH = "6.1.x+fslc" 26KBRANCH = "6.1.x+fslc"
27SRCREV = "b80c9dede70132da3ae7feb949fe0803aad3db24" 27SRCREV = "195925841506cd58552d73ebabadd08d6016e4c6"
28 28
29KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" 29KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
30KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" 30KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
diff --git a/recipes-kernel/linux/linux-fslc-lts_6.6.bb b/recipes-kernel/linux/linux-fslc-lts_6.6.bb
new file mode 100644
index 000000000..cc067262a
--- /dev/null
+++ b/recipes-kernel/linux/linux-fslc-lts_6.6.bb
@@ -0,0 +1,37 @@
1# Copyright (C) 2012-2024 O.S. Systems Software LTDA.
2# Released under the MIT license (see COPYING.MIT for the terms)
3#
4# SPDX-License-Identifier: MIT
5#
6
7SUMMARY = "FSL Community BSP Linux LTS based kernel with backported features and fixes"
8DESCRIPTION = "Linux kernel based on LTS kernel used by FSL Community BSP in order to \
9provide support for some backported features and fixes, or because it was applied in upstream \
10and will not become part of a LTS version, or because it is not applicable for \
11upstreaming in any form."
12
13require linux-imx.inc
14
15SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https"
16
17# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
18# required by kernel-yocto.bbclass.
19#
20# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
21# should be updated once patchlevel is merged.
22LINUX_VERSION = "6.6.52"
23
24KBRANCH = "6.6.x+fslc"
25SRCREV = "3768fbd9dd8e0da9e7a24366b6a65a7f8ca25986"
26
27KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
28KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig"
29KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v6_v7_defconfig"
30KBUILD_DEFCONFIG:mx8-generic-bsp = "defconfig"
31KBUILD_DEFCONFIG:mx9-generic-bsp = "defconfig"
32KBUILD_DEFCONFIG:mxs-generic-bsp = "mxs_defconfig"
33KBUILD_DEFCONFIG:vf-generic-bsp = "imx_v6_v7_defconfig"
34
35LOCALVERSION = "-fslc"
36
37COMPATIBLE_MACHINE = "(imx-generic-bsp)"
diff --git a/recipes-kernel/linux/linux-fslc_6.6.bb b/recipes-kernel/linux/linux-fslc_6.12.bb
index 1919eacdf..8b66b82d4 100644
--- a/recipes-kernel/linux/linux-fslc_6.6.bb
+++ b/recipes-kernel/linux/linux-fslc_6.12.bb
@@ -14,15 +14,22 @@ require linux-imx.inc
14 14
15SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" 15SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https"
16 16
17DEPENDS += " \
18 coreutils-native \
19"
20
17# 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
18# required by kernel-yocto.bbclass. 22# required by kernel-yocto.bbclass.
19# 23#
20# 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
21# should be updated once patchlevel is merged. 25# should be updated once patchlevel is merged.
22LINUX_VERSION = "6.6.50" 26#
27# Linux kernel stable 6.12.34 changelog:
28# https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.34
29LINUX_VERSION = "6.12.34"
23 30
24KBRANCH = "6.6.x+fslc" 31KBRANCH = "6.12.x+fslc"
25SRCREV = "2473dfed9007471b503efe1f7de74d63eaf4c699" 32SRCREV = "e92f5b7050c74e8052f071fd2f1d233d9a4b2f30"
26 33
27KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig" 34KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
28KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig" 35KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig"
diff --git a/recipes-kernel/linux/linux-imx-headers/0001-video-fbdev-mxc-make-uapi-ipu.h-pxp_dma.h-compatible.patch b/recipes-kernel/linux/linux-imx-headers/0001-video-fbdev-mxc-make-uapi-ipu.h-pxp_dma.h-compatible.patch
new file mode 100644
index 000000000..1750d6247
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx-headers/0001-video-fbdev-mxc-make-uapi-ipu.h-pxp_dma.h-compatible.patch
@@ -0,0 +1,54 @@
1From a5bcb18b42cfc0485397da9f48be6a73de86dfac Mon Sep 17 00:00:00 2001
2From: Max Krummenacher <max.krummenacher@toradex.com>
3Date: Sat, 10 May 2025 14:21:35 +0200
4Subject: [PATCH] video: fbdev: mxc: make uapi ipu.h, pxp_dma.h compatible with
5 c23 standard
6
7In C23 standard bool, false, true are reserved keywords.
8Make ipu.h, pxp_dma.h uapi include file compatible with C23 standard.
9
10Upstream-Status: Pending
11Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
12---
13 include/uapi/linux/ipu.h | 4 ++++
14 include/uapi/linux/pxp_dma.h | 4 ++++
15 2 files changed, 8 insertions(+)
16
17diff --git a/include/uapi/linux/ipu.h b/include/uapi/linux/ipu.h
18index c92f292bcc9d..a7b60730bbd4 100644
19--- a/include/uapi/linux/ipu.h
20+++ b/include/uapi/linux/ipu.h
21@@ -29,9 +29,13 @@
22 #include <linux/videodev2.h>
23
24 #ifndef __KERNEL__
25+#if defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L
26+/* bool, true and false are keywords. */
27+#else
28 #ifndef __cplusplus
29 typedef unsigned char bool;
30 #endif
31+#endif
32 #define irqreturn_t int
33 #define dma_addr_t int
34 #define uint32_t unsigned int
35diff --git a/include/uapi/linux/pxp_dma.h b/include/uapi/linux/pxp_dma.h
36index 9b5228504095..e2deff07516d 100644
37--- a/include/uapi/linux/pxp_dma.h
38+++ b/include/uapi/linux/pxp_dma.h
39@@ -25,8 +25,12 @@
40
41 #ifndef __KERNEL__
42 typedef unsigned long dma_addr_t;
43+#if defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L
44+/* bool, true and false are keywords. */
45+#else
46 typedef unsigned char bool;
47 #endif
48+#endif
49
50 /* PXP Pixel format definitions */
51 /* Four-character-code (FOURCC) */
52--
532.42.0
54
diff --git a/recipes-kernel/linux/linux-imx-headers_6.6.bb b/recipes-kernel/linux/linux-imx-headers_6.12.bb
index 65634ac91..2f5ba04ee 100644
--- a/recipes-kernel/linux/linux-imx-headers_6.6.bb
+++ b/recipes-kernel/linux/linux-imx-headers_6.12.bb
@@ -7,12 +7,13 @@ New headers are installed in ${includedir}/imx."
7LICENSE = "GPL-2.0-only" 7LICENSE = "GPL-2.0-only"
8LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 8LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
9 9
10SRC_URI = "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" 10SRC_URI = " \
11SRCBRANCH = "lf-6.6.y" 11 git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH} \
12LOCALVERSION = "-6.6.23-2.0.0" 12 file://0001-video-fbdev-mxc-make-uapi-ipu.h-pxp_dma.h-compatible.patch \
13SRCREV = "b586a521770e508d1d440ccb085c7696b9d6d387" 13"
14 14SRCBRANCH = "lf-6.12.y"
15S = "${WORKDIR}/git" 15LOCALVERSION = "-lts-${SRCBRANCH}"
16SRCREV = "37d02f4dcbbe6677dc9f5fc17f386c05d6a7bd7a"
16 17
17do_configure[noexec] = "1" 18do_configure[noexec] = "1"
18 19
@@ -24,7 +25,6 @@ IMX_UAPI_HEADERS = " \
24 hx280enc.h \ 25 hx280enc.h \
25 ipu.h \ 26 ipu.h \
26 imx_vpu.h \ 27 imx_vpu.h \
27 mxc_asrc.h \
28 mxc_dcic.h \ 28 mxc_dcic.h \
29 mxc_mlb.h \ 29 mxc_mlb.h \
30 mxc_sim_interface.h \ 30 mxc_sim_interface.h \
@@ -36,6 +36,11 @@ IMX_UAPI_HEADERS = " \
36 videodev2.h \ 36 videodev2.h \
37" 37"
38 38
39IMX_UAPI_HEADERS_SOUND = " \
40 sound/compress_offload.h \
41 sound/compress_params.h \
42"
43
39do_install() { 44do_install() {
40 # We install all headers inside of B so we can copy only the 45 # We install all headers inside of B so we can copy only the
41 # i.MX-specific ones, and there is no risk of a new header to be 46 # i.MX-specific ones, and there is no risk of a new header to be
@@ -57,6 +62,11 @@ do_install() {
57 install -D -m 0644 ${B}${includedir}/linux/$h \ 62 install -D -m 0644 ${B}${includedir}/linux/$h \
58 ${D}${includedir}/imx/linux/$h 63 ${D}${includedir}/imx/linux/$h
59 done 64 done
65 install -d ${D}${includedir}/imx/linux/sound
66 for h in ${IMX_UAPI_HEADERS_SOUND}; do
67 install -D -m 0644 ${B}${includedir}/$h \
68 ${D}${includedir}/imx/$h
69 done
60} 70}
61 71
62# Allow to build empty main package, this is required in order for -dev package 72# Allow to build empty main package, this is required in order for -dev package
diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc
index 34d50cfc0..521bd7948 100644
--- a/recipes-kernel/linux/linux-imx.inc
+++ b/recipes-kernel/linux/linux-imx.inc
@@ -19,8 +19,6 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
19 19
20SRC_URI = "git://github.com/nxp-imx/linux-imx;protocol=https;branch=${SRCBRANCH}" 20SRC_URI = "git://github.com/nxp-imx/linux-imx;protocol=https;branch=${SRCBRANCH}"
21 21
22S = "${WORKDIR}/git"
23
24# Tell to kernel class that we would like to use our defconfig to configure the kernel. 22# Tell to kernel class that we would like to use our defconfig to configure the kernel.
25# Otherwise, the --allnoconfig would be used per default which leads to mis-configured 23# Otherwise, the --allnoconfig would be used per default which leads to mis-configured
26# kernel. 24# kernel.
@@ -33,7 +31,7 @@ S = "${WORKDIR}/git"
33# specified, and should be restored with their defaults, not set to 'n'. 31# specified, and should be restored with their defaults, not set to 'n'.
34# To properly expand a defconfig like this, we need to specify: KCONFIG_MODE="--alldefconfig" 32# To properly expand a defconfig like this, we need to specify: KCONFIG_MODE="--alldefconfig"
35# in the kernel recipe include. 33# in the kernel recipe include.
36KCONFIG_MODE="--alldefconfig" 34KCONFIG_MODE = "--alldefconfig"
37 35
38# We need to pass it as param since kernel might support more then one 36# We need to pass it as param since kernel might support more then one
39# machine, with different entry points 37# machine, with different entry points
diff --git a/recipes-kernel/linux/linux-imx/0001-lib-build_OID_registry-don-t-mention-the-full-path-o.patch b/recipes-kernel/linux/linux-imx/0001-lib-build_OID_registry-don-t-mention-the-full-path-o.patch
deleted file mode 100644
index 2933c40e3..000000000
--- a/recipes-kernel/linux/linux-imx/0001-lib-build_OID_registry-don-t-mention-the-full-path-o.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1From 5ef6dc08cfde240b8c748733759185646e654570 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
3Date: Wed, 13 Mar 2024 22:19:56 +0100
4Subject: [PATCH] lib/build_OID_registry: don't mention the full path of the
5 script in output
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10This change strips the full path of the script generating
11lib/oid_registry_data.c to just lib/build_OID_registry. The motivation
12for this change is Yocto emitting a build warning
13
14 File /usr/src/debug/linux-lxatac/6.7-r0/lib/oid_registry_data.c in package linux-lxatac-src contains reference to TMPDIR [buildpaths]
15
16So this change brings us one step closer to make the build result
17reproducible independent of the build path.
18
19Upstream-Status: Backport [https://github.com/torvalds/linux/commit/5ef6dc08cfde240b8c748733759185646e654570]
20
21Link: https://lkml.kernel.org/r/20240313211957.884561-2-u.kleine-koenig@pengutronix.de
22Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
23Cc: Masahiro Yamada <masahiroy@kernel.org>
24Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
25Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
26---
27 lib/build_OID_registry | 5 ++++-
28 1 file changed, 4 insertions(+), 1 deletion(-)
29
30diff --git a/lib/build_OID_registry b/lib/build_OID_registry
31index d7fc32ea8ac2..56d8bafeb848 100755
32--- a/lib/build_OID_registry
33+++ b/lib/build_OID_registry
34@@ -8,6 +8,7 @@
35 #
36
37 use strict;
38+use Cwd qw(abs_path);
39
40 my @names = ();
41 my @oids = ();
42@@ -17,6 +18,8 @@ if ($#ARGV != 1) {
43 exit(2);
44 }
45
46+my $abs_srctree = abs_path($ENV{'srctree'});
47+
48 #
49 # Open the file to read from
50 #
51@@ -35,7 +38,7 @@ close IN_FILE || die;
52 #
53 open C_FILE, ">$ARGV[1]" or die;
54 print C_FILE "/*\n";
55-print C_FILE " * Automatically generated by ", $0, ". Do not edit\n";
56+print C_FILE " * Automatically generated by ", $0 =~ s#^\Q$abs_srctree/\E##r, ". Do not edit\n";
57 print C_FILE " */\n";
58
59 #
60--
612.34.1
62
diff --git a/recipes-kernel/linux/linux-imx/0001-tty-vt-conmakehash-Don-t-mention-the-full-path-of-th.patch b/recipes-kernel/linux/linux-imx/0001-tty-vt-conmakehash-Don-t-mention-the-full-path-of-th.patch
deleted file mode 100644
index dbeae5150..000000000
--- a/recipes-kernel/linux/linux-imx/0001-tty-vt-conmakehash-Don-t-mention-the-full-path-of-th.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From 3bd85c6c97b2d232638594bf828de62083fe3389 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
3Date: Mon, 11 Mar 2024 12:30:18 +0100
4Subject: [PATCH] tty: vt: conmakehash: Don't mention the full path of the
5 input in output
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10This change strips $abs_srctree of the input file containing the
11character mapping table in the generated output. The motivation for this
12change is Yocto emitting a build warning
13
14 WARNING: linux-lxatac-6.7-r0 do_package_qa: QA Issue: File /usr/src/debug/linux-lxatac/6.7-r0/drivers/tty/vt/consolemap_deftbl.c in package linux-lxatac-src contains reference to TMPDIR
15
16So this change brings us one step closer to make the build result
17reproducible independent of the build path.
18
19Upstream-Status: Backport [https://github.com/torvalds/linux/commit/3bd85c6c97b2d232638594bf828de62083fe3389]
20
21Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
22Link: https://lore.kernel.org/r/20240311113017.483101-2-u.kleine-koenig@pengutronix.de
23Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
24---
25 drivers/tty/vt/conmakehash.c | 15 +++++++++++++--
26 1 file changed, 13 insertions(+), 2 deletions(-)
27
28diff --git a/drivers/tty/vt/conmakehash.c b/drivers/tty/vt/conmakehash.c
29index cddd789fe46e..dc2177fec715 100644
30--- a/drivers/tty/vt/conmakehash.c
31+++ b/drivers/tty/vt/conmakehash.c
32@@ -76,7 +76,8 @@ static void addpair(int fp, int un)
33 int main(int argc, char *argv[])
34 {
35 FILE *ctbl;
36- char *tblname;
37+ const char *tblname, *rel_tblname;
38+ const char *abs_srctree;
39 char buffer[65536];
40 int fontlen;
41 int i, nuni, nent;
42@@ -101,6 +102,16 @@ int main(int argc, char *argv[])
43 }
44 }
45
46+ abs_srctree = getenv("abs_srctree");
47+ if (abs_srctree && !strncmp(abs_srctree, tblname, strlen(abs_srctree)))
48+ {
49+ rel_tblname = tblname + strlen(abs_srctree);
50+ while (*rel_tblname == '/')
51+ ++rel_tblname;
52+ }
53+ else
54+ rel_tblname = tblname;
55+
56 /* For now we assume the default font is always 256 characters. */
57 fontlen = 256;
58
59@@ -253,7 +264,7 @@ int main(int argc, char *argv[])
60 #include <linux/types.h>\n\
61 \n\
62 u8 dfont_unicount[%d] = \n\
63-{\n\t", argv[1], fontlen);
64+{\n\t", rel_tblname, fontlen);
65
66 for ( i = 0 ; i < fontlen ; i++ )
67 {
68--
692.34.1
70
diff --git a/recipes-kernel/linux/linux-imx/0001-video-logo-Drop-full-path-of-the-input-filename-in-g.patch b/recipes-kernel/linux/linux-imx/0001-video-logo-Drop-full-path-of-the-input-filename-in-g.patch
deleted file mode 100644
index b9ec1be3a..000000000
--- a/recipes-kernel/linux/linux-imx/0001-video-logo-Drop-full-path-of-the-input-filename-in-g.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From fb3b9c2d217f1f51fffe19fc0f4eaf55e2d4ea4f Mon Sep 17 00:00:00 2001
2From: Lucas Stach <l.stach@pengutronix.de>
3Date: Wed, 10 Apr 2024 15:41:21 +0200
4Subject: [PATCH 6/6] video: logo: Drop full path of the input filename in
5 generated file
6
7Avoid this Yocto build warning to make build reproducible:
8
9 WARNING: linux-foo-6.8-r0 do_package_qa: QA Issue:
10 File /usr/src/debug/linux-foo/6.8-r0/drivers/video/logo/logo_linux_clut224.c
11 in package linux-foo-src contains reference to TMPDIR
12
13Helge modified the patch to drop the whole line.
14
15Upstream-Status: Backport [https://github.com/torvalds/linux/commit/fb3b9c2d217f1f51fffe19fc0f4eaf55e2d4ea4f]
16
17Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
18Signed-off-by: Helge Deller <deller@gmx.de>
19---
20 drivers/video/logo/pnmtologo.c | 2 --
21 1 file changed, 2 deletions(-)
22
23diff --git a/drivers/video/logo/pnmtologo.c b/drivers/video/logo/pnmtologo.c
24index 2434a25afb64..8080c4d9c4a2 100644
25--- a/drivers/video/logo/pnmtologo.c
26+++ b/drivers/video/logo/pnmtologo.c
27@@ -235,8 +235,6 @@ static void write_header(void)
28 fputs("/*\n", out);
29 fputs(" * DO NOT EDIT THIS FILE!\n", out);
30 fputs(" *\n", out);
31- fprintf(out, " * It was automatically generated from %s\n", filename);
32- fputs(" *\n", out);
33 fprintf(out, " * Linux logo %s\n", logoname);
34 fputs(" */\n\n", out);
35 fputs("#include <linux/linux_logo.h>\n\n", out);
36--
372.34.1
38
diff --git a/recipes-kernel/linux/linux-imx_6.6.bb b/recipes-kernel/linux/linux-imx_6.12.bb
index b90b40d33..05d9c4ea6 100644
--- a/recipes-kernel/linux/linux-imx_6.6.bb
+++ b/recipes-kernel/linux/linux-imx_6.12.bb
@@ -12,22 +12,16 @@ i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU
12 12
13require recipes-kernel/linux/linux-imx.inc 13require recipes-kernel/linux/linux-imx.inc
14 14
15SRCBRANCH = "lf-6.6.y" 15SRCBRANCH = "lf-6.12.y"
16LOCALVERSION = "-6.6.23-2.0.0" 16LOCALVERSION = "-6.12.3-1.1.0"
17SRCREV = "b586a521770e508d1d440ccb085c7696b9d6d387" 17SRCREV = "37d02f4dcbbe6677dc9f5fc17f386c05d6a7bd7a"
18
19SRC_URI += " \
20 file://0001-tty-vt-conmakehash-Don-t-mention-the-full-path-of-th.patch \
21 file://0001-lib-build_OID_registry-don-t-mention-the-full-path-o.patch \
22 file://0001-video-logo-Drop-full-path-of-the-input-filename-in-g.patch \
23"
24 18
25# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition 19# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
26# required by kernel-yocto.bbclass. 20# required by kernel-yocto.bbclass.
27# 21#
28# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and 22# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
29# should be updated once patchlevel is merged. 23# should be updated once patchlevel is merged.
30LINUX_VERSION = "6.6.23" 24LINUX_VERSION = "6.12.3"
31 25
32KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" 26KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
33KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" 27KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"
diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc
index 5d28ae84a..7243a345c 100644
--- a/recipes-kernel/linux/linux-qoriq.inc
+++ b/recipes-kernel/linux/linux-qoriq.inc
@@ -5,8 +5,6 @@ SUMMARY = "Linux Kernel for NXP QorIQ platforms"
5SECTION = "kernel" 5SECTION = "kernel"
6LICENSE = "GPL-2.0-only" 6LICENSE = "GPL-2.0-only"
7 7
8S = "${WORKDIR}/git"
9
10DEPENDS:append = " libgcc" 8DEPENDS:append = " libgcc"
11# not put Images into /boot of rootfs, install kernel-image if needed 9# not put Images into /boot of rootfs, install kernel-image if needed
12RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" 10RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
@@ -44,13 +42,13 @@ do_merge_delta_config() {
44 for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do 42 for deltacfg in ${DELTA_KERNEL_DEFCONFIG}; do
45 if [ -f ${S}/arch/${ARCH}/configs/${deltacfg} ]; then 43 if [ -f ${S}/arch/${ARCH}/configs/${deltacfg} ]; then
46 oe_runmake -C ${S} O=${B} ${deltacfg} 44 oe_runmake -C ${S} O=${B} ${deltacfg}
47 elif [ -f "${WORKDIR}/${deltacfg}" ]; then 45 elif [ -f "${UNPACKDIR}/${deltacfg}" ]; then
48 ${S}/scripts/kconfig/merge_config.sh -m .config ${WORKDIR}/${deltacfg} 46 ${S}/scripts/kconfig/merge_config.sh -m .config ${UNPACKDIR}/${deltacfg}
49 elif [ -f "${deltacfg}" ]; then 47 elif [ -f "${deltacfg}" ]; then
50 ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg} 48 ${S}/scripts/kconfig/merge_config.sh -m .config ${deltacfg}
51 fi 49 fi
52 done 50 done
53 cp .config ${WORKDIR}/defconfig 51 cp .config ${UNPACKDIR}/defconfig
54} 52}
55addtask merge_delta_config before do_kernel_localversion after do_patch 53addtask merge_delta_config before do_kernel_localversion after do_patch
56 54
diff --git a/recipes-kernel/skmm-host/skmm-host_git.bb b/recipes-kernel/skmm-host/skmm-host_git.bb
index 9e75f5efb..cc226bd9a 100644
--- a/recipes-kernel/skmm-host/skmm-host_git.bb
+++ b/recipes-kernel/skmm-host/skmm-host_git.bb
@@ -8,9 +8,7 @@ inherit module qoriq_build_64bit_kernel
8SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/skmm-host;protocol=https;nobranch=1" 8SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/skmm-host;protocol=https;nobranch=1"
9SRCREV = "d5912ebdb8d3b29b1e2df52710e8821d1ce3eb80" 9SRCREV = "d5912ebdb8d3b29b1e2df52710e8821d1ce3eb80"
10 10
11S = "${WORKDIR}/git" 11EXTRA_OEMAKE = 'KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
12
13EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
14 12
15FILES:${PN} += "/etc/skmm/ /usr/bin/" 13FILES:${PN} += "/etc/skmm/ /usr/bin/"
16 14
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-08 17:47:54 +0000