summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/machine/imx6ullevk.conf1
-rw-r--r--conf/machine/imx6ulz-14x14-evk.conf1
-rw-r--r--recipes-bsp/imx-lib/imx-lib_git.bb4
-rw-r--r--recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch55
-rw-r--r--recipes-bsp/imx-mkimage/imx-mkimage_git.inc4
-rw-r--r--recipes-bsp/imx-test/imx-test_git.bb4
-rw-r--r--recipes-bsp/u-boot/u-boot-imx-common_2023.04.inc (renamed from recipes-bsp/u-boot/u-boot-imx-common_2022.04.inc)6
-rw-r--r--recipes-bsp/u-boot/u-boot-imx_2023.04.bb (renamed from recipes-bsp/u-boot/u-boot-imx_2022.04.bb)4
-rw-r--r--recipes-kernel/linux/linux-fslc-imx_6.1.bb16
-rw-r--r--recipes-kernel/linux/linux-imx-headers_6.1.bb4
-rw-r--r--recipes-kernel/linux/linux-imx_6.1.bb6
11 files changed, 56 insertions, 49 deletions
diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf
index a773bb6a..60668c2f 100644
--- a/conf/machine/imx6ullevk.conf
+++ b/conf/machine/imx6ullevk.conf
@@ -17,7 +17,6 @@ KERNEL_DEVICETREE = " \
17 17
18KERNEL_DEVICETREE:append:use-nxp-bsp = " \ 18KERNEL_DEVICETREE:append:use-nxp-bsp = " \
19 imx6ull-14x14-evk-btwifi.dtb \ 19 imx6ull-14x14-evk-btwifi.dtb \
20 imx6ull-14x14-evk-btwifi-sdio3_0.dtb \
21 imx6ull-14x14-evk-emmc.dtb \ 20 imx6ull-14x14-evk-emmc.dtb \
22 imx6ull-14x14-evk-gpmi-weim.dtb \ 21 imx6ull-14x14-evk-gpmi-weim.dtb \
23" 22"
diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf
index 994ad850..6cb1698d 100644
--- a/conf/machine/imx6ulz-14x14-evk.conf
+++ b/conf/machine/imx6ulz-14x14-evk.conf
@@ -16,7 +16,6 @@ KERNEL_DEVICETREE = " \
16" 16"
17KERNEL_DEVICETREE:append:use-nxp-bsp = " \ 17KERNEL_DEVICETREE:append:use-nxp-bsp = " \
18 imx6ulz-14x14-evk-btwifi.dtb \ 18 imx6ulz-14x14-evk-btwifi.dtb \
19 imx6ull-14x14-evk-btwifi-sdio3_0.dtb \
20 imx6ulz-14x14-evk-emmc.dtb \ 19 imx6ulz-14x14-evk-emmc.dtb \
21 imx6ulz-14x14-evk-gpmi-weim.dtb \ 20 imx6ulz-14x14-evk-gpmi-weim.dtb \
22" 21"
diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb
index d3d0450f..db09982a 100644
--- a/recipes-bsp/imx-lib/imx-lib_git.bb
+++ b/recipes-bsp/imx-lib/imx-lib_git.bb
@@ -13,8 +13,8 @@ PE = "1"
13PV = "5.9+${SRCPV}" 13PV = "5.9+${SRCPV}"
14 14
15SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}" 15SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}"
16SRCBRANCH = "lf-6.1.1_1.0.0" 16SRCBRANCH = "lf-6.1.22_2.0.0"
17SRCREV = "43e5ee7dc4f88d883f8ce2bea309f8708be88a3e" 17SRCREV = "8f124c3914d82019849fb697baeb730e4cb1b547"
18 18
19S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"
20 20
diff --git a/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch b/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch
index a8b0332d..d05e54ad 100644
--- a/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch
+++ b/recipes-bsp/imx-mkimage/files/0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch
@@ -1,6 +1,6 @@
1From 70b7d067ca0f6659e4f842f8d841714a26bf9d8c Mon Sep 17 00:00:00 2001 1From 3e0f78a4efeac4ea0651ac763099d780447a18b4 Mon Sep 17 00:00:00 2001
2From: Andrey Zhizhikin <andrey.z@gmail.com> 2From: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
3Date: Thu, 21 Oct 2021 08:53:38 +0000 3Date: Wed, 19 Jul 2023 18:34:32 +0300
4Subject: [PATCH] iMX8M: soc.mak: use native mkimage from sysroot 4Subject: [PATCH] iMX8M: soc.mak: use native mkimage from sysroot
5 5
6mkimage tool is provided as a part of sysroot from Yocto build. Current 6mkimage tool is provided as a part of sysroot from Yocto build. Current
@@ -13,63 +13,65 @@ build.
13 13
14Use it from the build sysroot, and do not pull the local version of it. 14Use it from the build sysroot, and do not pull the local version of it.
15 15
16Upstream-Status: Inappropriate [OE-specific] 16Reinjected the original patch from Andrey Zhizhikin <andrey.z@gmail.com>
17 17
18Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> 18Upstream-Status: Inappropriate [OE-specific]
19Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
19--- 20---
21
20 iMX8M/soc.mak | 11 +++++------ 22 iMX8M/soc.mak | 11 +++++------
21 1 file changed, 5 insertions(+), 6 deletions(-) 23 1 file changed, 5 insertions(+), 6 deletions(-)
22 24
23Index: git/iMX8M/soc.mak 25diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak
24=================================================================== 26index 3486079..855c1e5 100644
25--- git.orig/iMX8M/soc.mak 27--- a/iMX8M/soc.mak
26+++ git/iMX8M/soc.mak 28+++ b/iMX8M/soc.mak
27@@ -149,7 +149,7 @@ u-boot.itb: $(dtb) 29@@ -155,7 +155,7 @@ u-boot.itb: $(dtb) $(supp_dtbs)
28 ./$(PAD_IMAGE) bl31.bin 30 ./$(PAD_IMAGE) bl31.bin
29 ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb) 31 ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb) $(supp_dtbs)
30 BL32=$(TEE) DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb) > u-boot.its 32 BL32=$(TEE) DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb) $(supp_dtbs) > u-boot.its
31- ./mkimage_uboot -E -p 0x3000 -f u-boot.its u-boot.itb 33- ./mkimage_uboot -E -p 0x3000 -f u-boot.its u-boot.itb
32+ mkimage -E -p 0x3000 -f u-boot.its u-boot.itb 34+ mkimage -E -p 0x3000 -f u-boot.its u-boot.itb
33 @rm -f u-boot.its $(dtb) 35 @rm -f u-boot.its $(dtb)
34 36
35 dtb_ddr3l = valddr3l.dtb 37 dtb_ddr3l = valddr3l.dtb
36@@ -161,7 +161,7 @@ u-boot-ddr3l.itb: $(dtb_ddr3l) 38@@ -167,7 +167,7 @@ u-boot-ddr3l.itb: $(dtb_ddr3l) $(supp_dtbs)
37 ./$(PAD_IMAGE) bl31.bin 39 ./$(PAD_IMAGE) bl31.bin
38 ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l) 40 ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l) $(supp_dtbs)
39 DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb_ddr3l) > u-boot-ddr3l.its 41 DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb_ddr3l) $(supp_dtbs) > u-boot-ddr3l.its
40- ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr3l.its u-boot-ddr3l.itb 42- ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr3l.its u-boot-ddr3l.itb
41+ mkimage -E -p 0x3000 -f u-boot-ddr3l.its u-boot-ddr3l.itb 43+ mkimage -E -p 0x3000 -f u-boot-ddr3l.its u-boot-ddr3l.itb
42 @rm -f u-boot.its $(dtb_ddr3l) 44 @rm -f u-boot.its $(dtb_ddr3l)
43 45
44 dtb_ddr3l_evk = evkddr3l.dtb 46 dtb_ddr3l_evk = evkddr3l.dtb
45@@ -173,7 +173,7 @@ u-boot-ddr3l-evk.itb: $(dtb_ddr3l_evk) 47@@ -179,7 +179,7 @@ u-boot-ddr3l-evk.itb: $(dtb_ddr3l_evk) $(supp_dtbs)
46 ./$(PAD_IMAGE) bl31.bin 48 ./$(PAD_IMAGE) bl31.bin
47 ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l_evk) 49 ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l_evk) $(supp_dtbs)
48 DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb_ddr3l_evk) > u-boot-ddr3l-evk.its 50 DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb_ddr3l_evk) $(supp_dtbs) > u-boot-ddr3l-evk.its
49- ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr3l-evk.its u-boot-ddr3l-evk.itb 51- ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr3l-evk.its u-boot-ddr3l-evk.itb
50+ mkimage -E -p 0x3000 -f u-boot-ddr3l-evk.its u-boot-ddr3l-evk.itb 52+ mkimage -E -p 0x3000 -f u-boot-ddr3l-evk.its u-boot-ddr3l-evk.itb
51 @rm -f u-boot.its $(dtb_ddr3l_evk) 53 @rm -f u-boot.its $(dtb_ddr3l_evk)
52 54
53 dtb_ddr4 = valddr4.dtb 55 dtb_ddr4 = valddr4.dtb
54@@ -185,7 +185,7 @@ u-boot-ddr4.itb: $(dtb_ddr4) 56@@ -191,7 +191,7 @@ u-boot-ddr4.itb: $(dtb_ddr4) $(supp_dtbs)
55 ./$(PAD_IMAGE) bl31.bin 57 ./$(PAD_IMAGE) bl31.bin
56 ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4) 58 ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4) $(supp_dtbs)
57 DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb_ddr4) > u-boot-ddr4.its 59 DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb_ddr4) $(supp_dtbs) > u-boot-ddr4.its
58- ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4.its u-boot-ddr4.itb 60- ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4.its u-boot-ddr4.itb
59+ mkimage -E -p 0x3000 -f u-boot-ddr4.its u-boot-ddr4.itb 61+ mkimage -E -p 0x3000 -f u-boot-ddr4.its u-boot-ddr4.itb
60 @rm -f u-boot.its $(dtb_ddr4) 62 @rm -f u-boot.its $(dtb_ddr4)
61 63
62 dtb_ddr4_evk = evkddr4.dtb 64 dtb_ddr4_evk = evkddr4.dtb
63@@ -197,7 +197,7 @@ u-boot-ddr4-evk.itb: $(dtb_ddr4_evk) 65@@ -203,7 +203,7 @@ u-boot-ddr4-evk.itb: $(dtb_ddr4_evk) $(supp_dtbs)
64 ./$(PAD_IMAGE) bl31.bin 66 ./$(PAD_IMAGE) bl31.bin
65 ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4_evk) 67 ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4_evk) $(supp_dtbs)
66 DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb_ddr4_evk) > u-boot-ddr4-evk.its 68 DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ../$(SOC_DIR)/mkimage_fit_atf.sh $(dtb_ddr4_evk) $(supp_dtbs) > u-boot-ddr4-evk.its
67- ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb 69- ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb
68+ mkimage -E -p 0x3000 -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb 70+ mkimage -E -p 0x3000 -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb
69 @rm -f u-boot.its $(dtb_ddr4_evk) 71 @rm -f u-boot.its $(dtb_ddr4_evk)
70 72
71 ifeq ($(HDMI),yes) 73 ifeq ($(HDMI),yes)
72@@ -343,7 +343,6 @@ nightly : 74@@ -353,7 +353,6 @@ nightly :
73 @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/fsl-$(PLAT)-evk.dtb -O fsl-$(PLAT)-evk.dtb 75 @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/fsl-$(PLAT)-evk.dtb -O fsl-$(PLAT)-evk.dtb
74 @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/signed_hdmi_imx8m.bin -O signed_hdmi_imx8m.bin 76 @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/signed_hdmi_imx8m.bin -O signed_hdmi_imx8m.bin
75 @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/signed_dp_imx8m.bin -O signed_dp_imx8m.bin 77 @$(WGET) -q $(SERVER)/$(DIR)/$(FW_DIR)/signed_dp_imx8m.bin -O signed_dp_imx8m.bin
@@ -77,3 +79,6 @@ Index: git/iMX8M/soc.mak
77 79
78 archive : 80 archive :
79 git ls-files --others --exclude-standard -z | xargs -0 tar rvf $(ARCHIVE_PATH)/$(ARCHIVE_NAME) 81 git ls-files --others --exclude-standard -z | xargs -0 tar rvf $(ARCHIVE_PATH)/$(ARCHIVE_NAME)
82--
832.40.1
84
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
index 3e2e939a..56f3fba5 100644
--- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
+++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
@@ -5,8 +5,8 @@ DEPENDS = "zlib-native openssl-native"
5SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \ 5SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \
6 file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \ 6 file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \
7" 7"
8SRCBRANCH = "lf-6.1.1_1.0.0" 8SRCBRANCH = "lf-6.1.22_2.0.0"
9SRCREV = "d489494622585a47b4be88988595b0e4f9598f39" 9SRCREV = "5cfd218012e080fb907d9cc301fbb4ece9bc17a9"
10 10
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
12 12
diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb
index 8851ed55..815a77df 100644
--- a/recipes-bsp/imx-test/imx-test_git.bb
+++ b/recipes-bsp/imx-test/imx-test_git.bb
@@ -19,8 +19,8 @@ PV = "7.0+${SRCPV}"
19 19
20SRC_URI = "git://github.com/nxp-imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \ 20SRC_URI = "git://github.com/nxp-imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \
21 file://memtool_profile" 21 file://memtool_profile"
22SRCBRANCH = "lf-6.1.1_1.0.0" 22SRCBRANCH = "lf-6.1.22_2.0.0"
23SRCREV = "75cb486d616e6561f803073b250a1d26e03a0d92" 23SRCREV = "9fe083c29439b71292df9a8e4d40c73f25828a69"
24 24
25S = "${WORKDIR}/git" 25S = "${WORKDIR}/git"
26 26
diff --git a/recipes-bsp/u-boot/u-boot-imx-common_2022.04.inc b/recipes-bsp/u-boot/u-boot-imx-common_2023.04.inc
index a5dba755..576369da 100644
--- a/recipes-bsp/u-boot/u-boot-imx-common_2022.04.inc
+++ b/recipes-bsp/u-boot/u-boot-imx-common_2023.04.inc
@@ -4,9 +4,9 @@ LICENSE = "GPL-2.0-or-later"
4LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" 4LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
5 5
6SRC_URI = "git://github.com/nxp-imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}" 6SRC_URI = "git://github.com/nxp-imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}"
7SRCBRANCH = "lf_v2022.04" 7SRCBRANCH = "lf_v2023.04"
8LOCALVERSION ?= "-imx_v2022.04_5.15.71-2.2.0" 8LOCALVERSION ?= "-imx_v2023.04_6.1.22-2.0.0"
9SRCREV = "7376547b9e424b2d0f42dfe96394168c781ca297" 9SRCREV = "af7d004eaf18437c7db76f7962652b924099405b"
10 10
11DEPENDS += " \ 11DEPENDS += " \
12 bc-native \ 12 bc-native \
diff --git a/recipes-bsp/u-boot/u-boot-imx_2022.04.bb b/recipes-bsp/u-boot/u-boot-imx_2023.04.bb
index e76c29c6..59dcee56 100644
--- a/recipes-bsp/u-boot/u-boot-imx_2022.04.bb
+++ b/recipes-bsp/u-boot/u-boot-imx_2023.04.bb
@@ -1,9 +1,9 @@
1# Copyright (C) 2013-2016 Freescale Semiconductor 1# Copyright (C) 2013-2016 Freescale Semiconductor
2# Copyright 2018 (C) O.S. Systems Software LTDA. 2# Copyright 2018 (C) O.S. Systems Software LTDA.
3# Copyright (C) 2017-2021 NXP 3# Copyright (C) 2017-2023 NXP
4 4
5require recipes-bsp/u-boot/u-boot.inc 5require recipes-bsp/u-boot/u-boot.inc
6require u-boot-imx-common_${PV}.inc 6require recipes-bsp/u-boot/u-boot-imx-common_${PV}.inc
7 7
8PROVIDES += "u-boot u-boot-mfgtool" 8PROVIDES += "u-boot u-boot-mfgtool"
9 9
diff --git a/recipes-kernel/linux/linux-fslc-imx_6.1.bb b/recipes-kernel/linux/linux-fslc-imx_6.1.bb
index 8c26da77..1dcb1f91 100644
--- a/recipes-kernel/linux/linux-fslc-imx_6.1.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_6.1.bb
@@ -28,17 +28,21 @@ 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.1.24 31# tag: v6.1.38
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.1.1-1.0.0 36# tag: lf-6.1.22-2.0.0
37# 37#
38# ------------------------------------------------------------------------------ 38# ------------------------------------------------------------------------------
39# 3. Critical patches (SHA(s)) 39# 3. Critical patches (SHA(s))
40# ------------------------------------------------------------------------------ 40# ------------------------------------------------------------------------------
41# - ad9ab3b3c553c ARM: imx_v7_defconfig: Remove KERNEL_LZO config 41# - 3f1f2ea729550 mxc: gpu-viv: change _QuerySignal() return type to gceSTATUS
42# - b73c6797ee427 ARM: imx_v7_defconfig: Remove KERNEL_LZO config
43# - ec33c7fc43bef touchscreen: Kconfig: add I2C dependency for CT36X
44# - 6c41233a2cfbe pwm: pwm-adp5585: fix get_state callback prototype
45# - 9c7540ecb891f pwm: pwm-rpmsg-imx: fix get_state callback prototype
42# 46#
43# NOTE to upgraders: 47# NOTE to upgraders:
44# This recipe should NOT collect individual patches, they should be applied to 48# This recipe should NOT collect individual patches, they should be applied to
@@ -48,16 +52,16 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
48 52
49require linux-imx.inc 53require linux-imx.inc
50 54
51KBRANCH = "6.1-1.0.x-imx" 55KBRANCH = "6.1-2.0.x-imx"
52SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" 56SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https"
53SRCREV = "ad9ab3b3c553cbc3c61f233b6e2cd5abdd2a624b" 57SRCREV = "b872b1170fc8843b55e9f8838dd373ff43bb7552"
54 58
55# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition 59# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
56# required by kernel-yocto.bbclass. 60# required by kernel-yocto.bbclass.
57# 61#
58# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and 62# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
59# should be updated once patchlevel is merged. 63# should be updated once patchlevel is merged.
60LINUX_VERSION = "6.1.24" 64LINUX_VERSION = "6.1.38"
61 65
62KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" 66KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
63KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" 67KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"
diff --git a/recipes-kernel/linux/linux-imx-headers_6.1.bb b/recipes-kernel/linux/linux-imx-headers_6.1.bb
index cec22c1b..633418ab 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.1-1.0.0" 12LOCALVERSION = "-6.1.22-2.0.0"
13SRCREV = "29549c7073bf72cfb2c4614d37de45ec36b60475" 13SRCREV = "66e442bc7fdcc935e6faa94c743f653263d4ed67"
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 59a7e5cc..8b1e6045 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
15SRC_URI += "file://ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch" 15SRC_URI += "file://ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch"
16 16
17SRCBRANCH = "lf-6.1.y" 17SRCBRANCH = "lf-6.1.y"
18LOCALVERSION = "-6.1.1-1.0.0" 18LOCALVERSION = "-6.1.22-2.0.0"
19SRCREV = "29549c7073bf72cfb2c4614d37de45ec36b60475" 19SRCREV = "66e442bc7fdcc935e6faa94c743f653263d4ed67"
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.1" 26LINUX_VERSION = "6.1.22"
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"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-06-21 14:49:45 +0000