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

4 files changed, 16 insertions, 14 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"