Merge pull request #1504 from MrCry0/master-lf-6.1.1_1.0.0

Update linux kernel and related recipes to 6.1.1-1.0.0

8 files changed, 37 insertions, 33 deletions

diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb
index 0a7f2462..3b4714ee 100644
--- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb
+++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb
@@ -11,8 +11,8 @@ LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://EULA.txt;md5=be5ff43682ed6c57dfcbeb97651c2829"
 
 SRC_URI = "git://github.com/NXP/imx-firmware.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "lf-5.15.71_2.2.0"
-SRCREV = "982bb10dfabfb9e7b9dc106c59a4fbb2c45bfb44"
+SRCBRANCH = "lf-6.1.1_1.0.0"
+SRCREV = "bacbeb4789c1b13d13aab12ada29217ce8c3e905"
 
 S = "${WORKDIR}/git"
 
@@ -26,17 +26,13 @@ do_compile() {
 }
 
 do_install() {
-    install -d ${D}${sysconfdir}/firmware
-
     # Install various flavors of Broadcom firmware provided by Murata:
     # - bcm4359-pcie
-    install -d ${D}${nonarch_base_libdir}/firmware/brcm
-    install -m 0644 cyw-wifi-bt/*_CYW*/brcmfmac4359-pcie* ${D}${nonarch_base_libdir}/firmware/brcm
+    install -D -m 0644 cyw-wifi-bt/*_CYW*/brcmfmac4359-pcie* ${D}${nonarch_base_libdir}/firmware/brcm
     install -m 0644 cyw-wifi-bt/*_CYW*/BCM4349B1*.hcd ${D}${sysconfdir}/firmware
 
     # Install NXP Connectivity common
-    install -d ${D}${nonarch_base_libdir}/firmware/nxp
-    install -m 0644 nxp/wifi_mod_para.conf ${D}${nonarch_base_libdir}/firmware/nxp
+    install -D -m 0644 nxp/wifi_mod_para.conf ${D}${nonarch_base_libdir}/firmware/nxp
 
     # Install NXP Connectivity SD8801 firmware
     install -m 0644 nxp/FwImage_8801_SD/ed_mac_ctrl_V1_8801.conf  ${D}${nonarch_base_libdir}/firmware/nxp
@@ -64,6 +60,12 @@ do_install() {
 
     # Install NXP Connectivity SDIO9098 firmware
     install -m 0644 nxp/FwImage_9098_SD/sdiouart9098_combo_v1.bin ${D}${nonarch_base_libdir}/firmware/nxp
+
+    # Install NXP Connectivity IW416 firmware
+    install -m 0644 nxp/FwImage_IW416_SD/sdiouartiw416_combo_v0.bin ${D}${nonarch_base_libdir}/firmware/nxp
+
+    # Install NXP Connectivity IW612 firmware
+    install -m 0644 nxp/FwImage_IW612_SD/sduart_nw61x_v1.bin.se  ${D}${nonarch_base_libdir}/firmware/nxp
 }
 
 PACKAGES =+ " \
diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb
index 3bb1dcaf..620cab83 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"
 PV = "5.9+${SRCPV}"
 
 SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "lf-5.15.71_2.2.0"
-SRCREV = "87ddd80953835eb29027d1d5a12044a08e809e40"
+SRCBRANCH = "lf-6.1.1_1.0.0"
+SRCREV = "43e5ee7dc4f88d883f8ce2bea309f8708be88a3e"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc
index 4a4bc4c9..3e2e939a 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"
 SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \
            file://0001-iMX8M-soc.mak-use-native-mkimage-from-sysroot.patch \
 "
-SRCBRANCH = "lf-5.15.71_2.2.0"
-SRCREV = "3bfcfccb71ddf894be9c402732ccb229fe72099e"
+SRCBRANCH = "lf-6.1.1_1.0.0"
+SRCREV = "d489494622585a47b4be88988595b0e4f9598f39"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb
index e041c794..8851ed55 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}"
 
 SRC_URI = "git://github.com/nxp-imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \
            file://memtool_profile"
-SRCBRANCH = "lf-5.15.71_2.2.0"
-SRCREV = "68243988862f0e66a37754b4dbe4e7833b903f0c"
+SRCBRANCH = "lf-6.1.1_1.0.0"
+SRCREV = "75cb486d616e6561f803073b250a1d26e03a0d92"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-extended/jailhouse/jailhouse_0.12.bb b/recipes-extended/jailhouse/jailhouse_0.12.bb
index 7e237553..6de4390d 100644
--- a/recipes-extended/jailhouse/jailhouse_0.12.bb
+++ b/recipes-extended/jailhouse/jailhouse_0.12.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/siemens/jailhouse"
 SECTION = "jailhouse"
 LICENSE = "GPL-2.0-only"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
                  file://tools/root-cell-config.c.tmpl;beginline=6;endline=33;md5=2825581c1666c44a17955dc574cfbfb3 \
                  file://include/jailhouse/hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \
                  file://include/jailhouse/cell-config.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \
@@ -13,8 +13,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
                  file://driver/jailhouse.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \
 "
 
-SRCBRANCH = "lf-5.15.71_2.2.0"
-SRCREV = "d9fffb8035a8a2b8d1182c750bd0e90bb4c0027a"
+SRCBRANCH = "lf-6.1.1_1.0.0"
+SRCREV = "8faaeb45b989f6f74f0d56e6ae9aaddbf5ebfb06"
 
 SRC_URI = "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https;branch=${SRCBRANCH}"
 
diff --git a/recipes-kernel/linux/linux-fslc-imx/mx8-nxp-bsp/defconfig b/recipes-kernel/linux/linux-fslc-imx/mx8-nxp-bsp/defconfig
index 1ef259ee..2afe735a 100644
--- a/recipes-kernel/linux/linux-fslc-imx/mx8-nxp-bsp/defconfig
+++ b/recipes-kernel/linux/linux-fslc-imx/mx8-nxp-bsp/defconfig
@@ -545,12 +545,12 @@ CONFIG_MEDIA_PLATFORM_SUPPORT=y
 CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_MXC_CAPTURE=y
+CONFIG_VIDEO_MXC_CAPTURE=m
 CONFIG_VIDEO_MX8_CAPTURE=y
-CONFIG_VIDEO_MXC_CSI_CAMERA=y
-CONFIG_MXC_MIPI_CSI=y
+CONFIG_VIDEO_MXC_CSI_CAMERA=m
+CONFIG_MXC_MIPI_CSI=m
 CONFIG_DWC_MIPI_CSI2_HOST=y
-CONFIG_MXC_CAMERA_OV5640_MIPI_V2=y
+CONFIG_MXC_CAMERA_OV5640_MIPI_V2=m
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_IMX8_JPEG=m
 CONFIG_VIDEO_AMPHION_VPU=y
@@ -856,6 +856,7 @@ CONFIG_STAGING_MEDIA=y
 CONFIG_VIDEO_HANTRO=m
 CONFIG_VIDEO_IMX_CAPTURE=y
 CONFIG_IMX8_MEDIA_DEVICE=m
+CONFIG_IMX8_MIPI_CSI2_YAV=m
 CONFIG_MHDP_HDMIRX=y
 CONFIG_MHDP_HDMIRX_CEC=y
 CONFIG_FSL_DPAA2=y
diff --git a/recipes-kernel/linux/linux-fslc-imx/mx9-nxp-bsp/defconfig b/recipes-kernel/linux/linux-fslc-imx/mx9-nxp-bsp/defconfig
index 1ef259ee..2afe735a 100644
--- a/recipes-kernel/linux/linux-fslc-imx/mx9-nxp-bsp/defconfig
+++ b/recipes-kernel/linux/linux-fslc-imx/mx9-nxp-bsp/defconfig
@@ -545,12 +545,12 @@ CONFIG_MEDIA_PLATFORM_SUPPORT=y
 CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_MXC_CAPTURE=y
+CONFIG_VIDEO_MXC_CAPTURE=m
 CONFIG_VIDEO_MX8_CAPTURE=y
-CONFIG_VIDEO_MXC_CSI_CAMERA=y
-CONFIG_MXC_MIPI_CSI=y
+CONFIG_VIDEO_MXC_CSI_CAMERA=m
+CONFIG_MXC_MIPI_CSI=m
 CONFIG_DWC_MIPI_CSI2_HOST=y
-CONFIG_MXC_CAMERA_OV5640_MIPI_V2=y
+CONFIG_MXC_CAMERA_OV5640_MIPI_V2=m
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_IMX8_JPEG=m
 CONFIG_VIDEO_AMPHION_VPU=y
@@ -856,6 +856,7 @@ CONFIG_STAGING_MEDIA=y
 CONFIG_VIDEO_HANTRO=m
 CONFIG_VIDEO_IMX_CAPTURE=y
 CONFIG_IMX8_MEDIA_DEVICE=m
+CONFIG_IMX8_MIPI_CSI2_YAV=m
 CONFIG_MHDP_HDMIRX=y
 CONFIG_MHDP_HDMIRX_CEC=y
 CONFIG_FSL_DPAA2=y
diff --git a/recipes-kernel/linux/linux-fslc-imx_5.15.bb b/recipes-kernel/linux/linux-fslc-imx_6.1.bb
index bddac40c..8e8b5424 100644
--- a/recipes-kernel/linux/linux-fslc-imx_5.15.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_6.1.bb
@@ -12,8 +12,8 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 ###############################################################################
 # This recipe (and corresponding kernel repository and branch) receives updates
 # from 3 different sources:
-# 1. Stable [linux-5.15.y] branch updates of korg;
-# 2. NXP-specific updates via branch [5.10-2.1.x-imx] shared via CodeAurora forum;
+# 1. Stable [linux-6.1.y] branch updates of korg;
+# 2. NXP-specific updates via branch [lf-6.1.y] shared via GitHub NXP repo;
 # 3. Critical patches, which are not (yet) integrated into either of 2 above
 #    sources, but are required to be applied to the kernel tree.
 #
@@ -28,12 +28,12 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 # ------------------------------------------------------------------------------
 # 1. Stable (tag or SHA(s))
 # ------------------------------------------------------------------------------
-#    tag: v5.15.87
+#    tag: v6.1.24
 #
 # ------------------------------------------------------------------------------
 # 2. NXP-specific (tag or SHA(s))
 # ------------------------------------------------------------------------------
-#    tag: lf-5.15.71-2.2.0
+#    tag: lf-6.1.1-1.0.0
 #
 # ------------------------------------------------------------------------------
 # 3. Critical patches (SHA(s))
@@ -50,18 +50,18 @@ include linux-fslc.inc
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
-KBRANCH = "5.15-2.2.x-imx"
-SRCREV = "0eb4504bd3b8fd125e83ec62da9ba039519f96c8"
+KBRANCH = "6.1-1.0.x-imx"
+SRCREV = "897d73a656fe33d0c4549c5de1d07797f99d6871"
 
 # 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 = "5.15.87"
+LINUX_VERSION = "6.1.24"
 
 # Local version indicates the branch name in the NXP kernel tree where patches are collected from.
-LOCALVERSION = "-5.15.87-2.2.0"
+LOCALVERSION = "-6.1.24-1.0.0"
 
 DEFAULT_PREFERENCE = "1"