From f2ce1d36a574dfe94f760433e0ccc2b842e349ac Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Tue, 18 Apr 2023 19:31:01 +0300 Subject: imx-mkimage: Update lf-5.15.71-2.2.0 to lf-6.1.1_1.0.0 Relevant changes: - d489494 Add SCR file SCR-imx-lib.txt for imx-mkimage - 9c3eae7 imx93: Add bootaux container for M33 - a9deaa5 MA-20928 Add support for TEE compression - c015c34 iMX93: support flash XIP boot - e72c588 iMX8DXL: update default hash algorithm for kernel image to SHA256 - 11fedfb Revert "iMX8DXL: add flash_kernel_sha256 target for sha256 hash alogorithm" Signed-off-by: Oleksandr Suvorov --- recipes-bsp/imx-mkimage/imx-mkimage_git.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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" -- cgit v1.2.3-54-g00ecf From f2c10466412fe567774464d6758b7c7dbedc22e5 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Tue, 18 Apr 2023 19:35:44 +0300 Subject: imx-test: Update from 5.15.71_2.2.0 to lf-6.1.1_1.0.0 Relevant changes: - 75cb486 Rename COPYING to LICENSE - 206abc4 LF-7974: imx-jpeg: Fix description for 12-bit formats - f719f59 LF-7974: imx-jpeg: Fix for "yuv420s-12" format - 3818814 LF-7974: imx-jpeg: Add 12-bit formats in jpeg unit test - 78a3fb0 LF-7956: mxc_v4l2_vpu_test: pass special timestamp for 8q - 49560fc LF-7861: mxc_v4l2_vpu_test: negotiate fourcc with it's v4l2 source - b0942f2 LF-7446: mxc_v4l2_vpu_test: avoid segmentation fault in ofile_run - 28bca3d LF6658: imx-jpeg: Add back support for contiguous NV12 - 290aa31 LF-6654: imx-jpeg: Add crop support for encoder - 576253e LF-6654 imx-jpeg: Use selection API in unit test app Signed-off-by: Oleksandr Suvorov --- recipes-bsp/imx-test/imx-test_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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" -- cgit v1.2.3-54-g00ecf From 504034b8c2c22854c78d7c41b506afa5c31502a4 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Tue, 18 Apr 2023 19:42:01 +0300 Subject: imx-lib: Update lf-5.15.71-2.2.0 to lf-6.1.1_1.0.0 Relevant changes: - 43e5ee7 Add SCR file SCR-imx-lib.txt for imx-lib - 1636fbe Update the hard-coded '/usr/lib' location to libdir variable Signed-off-by: Oleksandr Suvorov --- recipes-bsp/imx-lib/imx-lib_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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" -- cgit v1.2.3-54-g00ecf From f9ce2b8510e5cf6f6a3b87aac5ad59383d4b6fcc Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Tue, 18 Apr 2023 20:02:52 +0300 Subject: firmware-imx: firmware-nxp-wifi: remove unneeded commands Do not use separate commands to install target directories. Instead, add a proper option when files are installed. Signed-off-by: Oleksandr Suvorov --- recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb | 8 ++------ 1 file changed, 2 insertions(+), 6 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..a3fa3dd8 100644 --- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb +++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb @@ -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 -- cgit v1.2.3-54-g00ecf From e513c530c4884855094c6e6cbbef168b310b1005 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Tue, 18 Apr 2023 20:12:01 +0300 Subject: firmware-nxp-wifi: Update lf-5.15.71-2.2.0 to lf-6.1.1_1.0.0 Add installing firmware for IW416 and IW612. Relevant changes: - bacbeb4 MA-2102-1 [Android-powersave-image] Remove android_wifi_mod_para_powersave.conf - 09b5e3d FwImage: update firmware to mxm5x17368.p2 - 6b9248a FwImage: IW612: rename the IW612 firmware subdirectory - 87d2442 FwImage: update firmware to mxm5x17368 - 6fa6713 EULA.txt: update Software License to v40 - 5c66cfa FwImage: SD8801: change the ed_mac value for muRata 2DS module Signed-off-by: Oleksandr Suvorov --- recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 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 a3fa3dd8..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" @@ -60,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 =+ " \ -- cgit v1.2.3-54-g00ecf From 01289ae67b57a60a18dcd3bc51e1240740228578 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Tue, 18 Apr 2023 22:05:48 +0300 Subject: jailhouse: Update lf-5.15.71_2.2.0 to lf-6.1.1_1.0.0 Update license: COPYING is renamed to LICENSE. Relevant changes: - 8faaeb45 Rename COPYING TO LICENSE - b0817a39 tools: demos: ivshmem-demo: force has_msix to 0 Signed-off-by: Oleksandr Suvorov --- recipes-extended/jailhouse/jailhouse_0.12.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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}" -- cgit v1.2.3-54-g00ecf From 4e135f3a45df1e10839b9058b17315792e60a644 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Tue, 18 Apr 2023 23:15:54 +0300 Subject: linux-fslc-imx: Upgrade to 6.1-1.0.x-imx Upgrade the kernel to 6.1-1.0.x-imx based on NXP lf-6.1.y and mainline stable linux-6.1.y. Stable version: 6.1.24 Actualize defconfig. Signed-off-by: Oleksandr Suvorov --- .../linux/linux-fslc-imx/mx8-nxp-bsp/defconfig | 9 +-- .../linux/linux-fslc-imx/mx9-nxp-bsp/defconfig | 9 +-- recipes-kernel/linux/linux-fslc-imx_5.15.bb | 68 ---------------------- recipes-kernel/linux/linux-fslc-imx_6.1.bb | 68 ++++++++++++++++++++++ 4 files changed, 78 insertions(+), 76 deletions(-) delete mode 100644 recipes-kernel/linux/linux-fslc-imx_5.15.bb create mode 100644 recipes-kernel/linux/linux-fslc-imx_6.1.bb 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_5.15.bb deleted file mode 100644 index bddac40c..00000000 --- a/recipes-kernel/linux/linux-fslc-imx_5.15.bb +++ /dev/null @@ -1,68 +0,0 @@ -# Released under the MIT license (see COPYING.MIT for the terms) -# -# SPDX-License-Identifier: MIT -# - -SUMMARY = "Linux Kernel provided by NXP and supported by Community" -DESCRIPTION = "Linux Kernel provided by NXP as the part of release distribution. \ -Main focus is set on i.MX Family Reference Boards. \ -It includes support for many NXP Proprietary IPs (GPU, VPU, IPU). \ -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; -# 3. Critical patches, which are not (yet) integrated into either of 2 above -# sources, but are required to be applied to the kernel tree. -# -# Therefore, there is a need to keep track on the patches which are introduced -# from every source. This could be achieved in this recipe by filling the -# below list with the information once the update is performed from any source. -# -# Once the critical patch gets merged into the stable branch, or NXP-specific -# patches would be covered by the tag - individual entries from sections below -# could be removed. -# -# ------------------------------------------------------------------------------ -# 1. Stable (tag or SHA(s)) -# ------------------------------------------------------------------------------ -# tag: v5.15.87 -# -# ------------------------------------------------------------------------------ -# 2. NXP-specific (tag or SHA(s)) -# ------------------------------------------------------------------------------ -# tag: lf-5.15.71-2.2.0 -# -# ------------------------------------------------------------------------------ -# 3. Critical patches (SHA(s)) -# ------------------------------------------------------------------------------ -# -# NOTE to upgraders: -# This recipe should NOT collect individual patches, they should be applied to -# the linux-fslc kernel tree on the corresponding branch, and tracking -# information should be properly filled in above. -############################################################################### - -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" - -# 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" - -# Local version indicates the branch name in the NXP kernel tree where patches are collected from. -LOCALVERSION = "-5.15.87-2.2.0" - -DEFAULT_PREFERENCE = "1" - -COMPATIBLE_MACHINE = "(imx-nxp-bsp)" diff --git a/recipes-kernel/linux/linux-fslc-imx_6.1.bb b/recipes-kernel/linux/linux-fslc-imx_6.1.bb new file mode 100644 index 00000000..8e8b5424 --- /dev/null +++ b/recipes-kernel/linux/linux-fslc-imx_6.1.bb @@ -0,0 +1,68 @@ +# Released under the MIT license (see COPYING.MIT for the terms) +# +# SPDX-License-Identifier: MIT +# + +SUMMARY = "Linux Kernel provided by NXP and supported by Community" +DESCRIPTION = "Linux Kernel provided by NXP as the part of release distribution. \ +Main focus is set on i.MX Family Reference Boards. \ +It includes support for many NXP Proprietary IPs (GPU, VPU, IPU). \ +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-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. +# +# Therefore, there is a need to keep track on the patches which are introduced +# from every source. This could be achieved in this recipe by filling the +# below list with the information once the update is performed from any source. +# +# Once the critical patch gets merged into the stable branch, or NXP-specific +# patches would be covered by the tag - individual entries from sections below +# could be removed. +# +# ------------------------------------------------------------------------------ +# 1. Stable (tag or SHA(s)) +# ------------------------------------------------------------------------------ +# tag: v6.1.24 +# +# ------------------------------------------------------------------------------ +# 2. NXP-specific (tag or SHA(s)) +# ------------------------------------------------------------------------------ +# tag: lf-6.1.1-1.0.0 +# +# ------------------------------------------------------------------------------ +# 3. Critical patches (SHA(s)) +# ------------------------------------------------------------------------------ +# +# NOTE to upgraders: +# This recipe should NOT collect individual patches, they should be applied to +# the linux-fslc kernel tree on the corresponding branch, and tracking +# information should be properly filled in above. +############################################################################### + +include linux-fslc.inc + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +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 = "6.1.24" + +# Local version indicates the branch name in the NXP kernel tree where patches are collected from. +LOCALVERSION = "-6.1.24-1.0.0" + +DEFAULT_PREFERENCE = "1" + +COMPATIBLE_MACHINE = "(imx-nxp-bsp)" -- cgit v1.2.3-54-g00ecf