Merge pull request #1667 from angolini/bump-linux-imx-2.1.0

Bump linux-imx to lf-6.1.36_2.1.0
Freescale · Oct 18, 2023 · d06f10d · d06f10d
2 parents d0eed11 + 3ba4648
commit d06f10d
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 71 deletions.
diff --git a/conf/machine/imx8mp-lpddr4-evk.conf b/conf/machine/imx8mp-lpddr4-evk.conf
@@ -42,6 +42,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/imx8mp-evk-rpmsg.dtb \
     freescale/imx8mp-evk-rpmsg-lpv.dtb \
     freescale/imx8mp-evk-sof-wm8960.dtb \
+    freescale/imx8mp-evk-sof-pdm.dtb \
     freescale/imx8mp-evk-spdif-lb.dtb \
     freescale/imx8mp-evk-usdhc1-m2.dtb \
     freescale/imx8mp-evk-8mic-swpdm.dtb \

diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf
@@ -16,6 +16,8 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67199.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67199-rpmsg.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-enet2.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-enet2-sja1105.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-enet2-tja1100.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif-rpmsg.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \

diff --git a/conf/machine/imx93-9x9-lpddr4-qsb.conf b/conf/machine/imx93-9x9-lpddr4-qsb.conf
@@ -18,6 +18,8 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-mt9m114.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ontat-wvga-panel.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-lpv.dtb \
 "
 
 UBOOT_CONFIG_BASENAME = "imx93_9x9_qsb"

diff --git a/recipes-kernel/linux/linux-imx/ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch b/recipes-kernel/linux/linux-imx/ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch
diff --git a/recipes-kernel/linux/linux-imx/drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch b/recipes-kernel/linux/linux-imx/drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch
diff --git a/recipes-kernel/linux/linux-imx_6.1.bb b/recipes-kernel/linux/linux-imx_6.1.bb
@@ -12,20 +12,16 @@ i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU
 
 require recipes-kernel/linux/linux-imx.inc
 
-SRC_URI += "file://ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch \
-            file://drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch \
-           "
-
 SRCBRANCH = "lf-6.1.y"
-LOCALVERSION = "-6.1.22-2.0.0"
-SRCREV = "66e442bc7fdcc935e6faa94c743f653263d4ed67"
+LOCALVERSION = "-6.1.36-2.1.0"
+SRCREV = "04b05c5527e9af8d81254638c307df07dc9a5dd3"
 
 # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
 # required by kernel-yocto.bbclass.
 #
 # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
 # should be updated once patchlevel is merged.
-LINUX_VERSION = "6.1.22"
+LINUX_VERSION = "6.1.36"
 
 KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
 KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"