diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2023-04-19 16:55:42 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-19 16:55:42 -0300 |
commit | eb1cd772923e816042363d5a0e554fd3bc1f985a (patch) | |
tree | 341d76570157ec120392a20748ee78413035e483 | |
parent | a612084a4688324dcd8f9478c7e24a31be56dfd6 (diff) | |
parent | 4e135f3a45df1e10839b9058b17315792e60a644 (diff) | |
download | meta-freescale-eb1cd772923e816042363d5a0e554fd3bc1f985a.tar.gz |
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
-rw-r--r-- | recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb | 18 | ||||
-rw-r--r-- | recipes-bsp/imx-lib/imx-lib_git.bb | 4 | ||||
-rw-r--r-- | recipes-bsp/imx-mkimage/imx-mkimage_git.inc | 4 | ||||
-rw-r--r-- | recipes-bsp/imx-test/imx-test_git.bb | 4 | ||||
-rw-r--r-- | recipes-extended/jailhouse/jailhouse_0.12.bb | 6 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx/mx8-nxp-bsp/defconfig | 9 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx/mx9-nxp-bsp/defconfig | 9 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx_6.1.bb (renamed from recipes-kernel/linux/linux-fslc-imx_5.15.bb) | 16 |
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" | |||
11 | LIC_FILES_CHKSUM = "file://EULA.txt;md5=be5ff43682ed6c57dfcbeb97651c2829" | 11 | LIC_FILES_CHKSUM = "file://EULA.txt;md5=be5ff43682ed6c57dfcbeb97651c2829" |
12 | 12 | ||
13 | SRC_URI = "git://github.com/NXP/imx-firmware.git;protocol=https;branch=${SRCBRANCH}" | 13 | SRC_URI = "git://github.com/NXP/imx-firmware.git;protocol=https;branch=${SRCBRANCH}" |
14 | SRCBRANCH = "lf-5.15.71_2.2.0" | 14 | SRCBRANCH = "lf-6.1.1_1.0.0" |
15 | SRCREV = "982bb10dfabfb9e7b9dc106c59a4fbb2c45bfb44" | 15 | SRCREV = "bacbeb4789c1b13d13aab12ada29217ce8c3e905" |
16 | 16 | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | 18 | ||
@@ -26,17 +26,13 @@ do_compile() { | |||
26 | } | 26 | } |
27 | 27 | ||
28 | do_install() { | 28 | do_install() { |
29 | install -d ${D}${sysconfdir}/firmware | ||
30 | |||
31 | # Install various flavors of Broadcom firmware provided by Murata: | 29 | # Install various flavors of Broadcom firmware provided by Murata: |
32 | # - bcm4359-pcie | 30 | # - bcm4359-pcie |
33 | install -d ${D}${nonarch_base_libdir}/firmware/brcm | 31 | install -D -m 0644 cyw-wifi-bt/*_CYW*/brcmfmac4359-pcie* ${D}${nonarch_base_libdir}/firmware/brcm |
34 | install -m 0644 cyw-wifi-bt/*_CYW*/brcmfmac4359-pcie* ${D}${nonarch_base_libdir}/firmware/brcm | ||
35 | install -m 0644 cyw-wifi-bt/*_CYW*/BCM4349B1*.hcd ${D}${sysconfdir}/firmware | 32 | install -m 0644 cyw-wifi-bt/*_CYW*/BCM4349B1*.hcd ${D}${sysconfdir}/firmware |
36 | 33 | ||
37 | # Install NXP Connectivity common | 34 | # Install NXP Connectivity common |
38 | install -d ${D}${nonarch_base_libdir}/firmware/nxp | 35 | install -D -m 0644 nxp/wifi_mod_para.conf ${D}${nonarch_base_libdir}/firmware/nxp |
39 | install -m 0644 nxp/wifi_mod_para.conf ${D}${nonarch_base_libdir}/firmware/nxp | ||
40 | 36 | ||
41 | # Install NXP Connectivity SD8801 firmware | 37 | # Install NXP Connectivity SD8801 firmware |
42 | install -m 0644 nxp/FwImage_8801_SD/ed_mac_ctrl_V1_8801.conf ${D}${nonarch_base_libdir}/firmware/nxp | 38 | 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() { | |||
64 | 60 | ||
65 | # Install NXP Connectivity SDIO9098 firmware | 61 | # Install NXP Connectivity SDIO9098 firmware |
66 | install -m 0644 nxp/FwImage_9098_SD/sdiouart9098_combo_v1.bin ${D}${nonarch_base_libdir}/firmware/nxp | 62 | install -m 0644 nxp/FwImage_9098_SD/sdiouart9098_combo_v1.bin ${D}${nonarch_base_libdir}/firmware/nxp |
63 | |||
64 | # Install NXP Connectivity IW416 firmware | ||
65 | install -m 0644 nxp/FwImage_IW416_SD/sdiouartiw416_combo_v0.bin ${D}${nonarch_base_libdir}/firmware/nxp | ||
66 | |||
67 | # Install NXP Connectivity IW612 firmware | ||
68 | install -m 0644 nxp/FwImage_IW612_SD/sduart_nw61x_v1.bin.se ${D}${nonarch_base_libdir}/firmware/nxp | ||
67 | } | 69 | } |
68 | 70 | ||
69 | PACKAGES =+ " \ | 71 | 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" | |||
13 | PV = "5.9+${SRCPV}" | 13 | PV = "5.9+${SRCPV}" |
14 | 14 | ||
15 | SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}" | 15 | SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}" |
16 | SRCBRANCH = "lf-5.15.71_2.2.0" | 16 | SRCBRANCH = "lf-6.1.1_1.0.0" |
17 | SRCREV = "87ddd80953835eb29027d1d5a12044a08e809e40" | 17 | SRCREV = "43e5ee7dc4f88d883f8ce2bea309f8708be88a3e" |
18 | 18 | ||
19 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
20 | 20 | ||
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" | |||
5 | SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH} \ | 5 | SRC_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 | " |
8 | SRCBRANCH = "lf-5.15.71_2.2.0" | 8 | SRCBRANCH = "lf-6.1.1_1.0.0" |
9 | SRCREV = "3bfcfccb71ddf894be9c402732ccb229fe72099e" | 9 | SRCREV = "d489494622585a47b4be88988595b0e4f9598f39" |
10 | 10 | ||
11 | S = "${WORKDIR}/git" | 11 | S = "${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 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}" | |||
19 | 19 | ||
20 | SRC_URI = "git://github.com/nxp-imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \ | 20 | SRC_URI = "git://github.com/nxp-imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \ |
21 | file://memtool_profile" | 21 | file://memtool_profile" |
22 | SRCBRANCH = "lf-5.15.71_2.2.0" | 22 | SRCBRANCH = "lf-6.1.1_1.0.0" |
23 | SRCREV = "68243988862f0e66a37754b4dbe4e7833b903f0c" | 23 | SRCREV = "75cb486d616e6561f803073b250a1d26e03a0d92" |
24 | 24 | ||
25 | S = "${WORKDIR}/git" | 25 | S = "${WORKDIR}/git" |
26 | 26 | ||
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" | |||
3 | SECTION = "jailhouse" | 3 | SECTION = "jailhouse" |
4 | LICENSE = "GPL-2.0-only" | 4 | LICENSE = "GPL-2.0-only" |
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ |
7 | file://tools/root-cell-config.c.tmpl;beginline=6;endline=33;md5=2825581c1666c44a17955dc574cfbfb3 \ | 7 | file://tools/root-cell-config.c.tmpl;beginline=6;endline=33;md5=2825581c1666c44a17955dc574cfbfb3 \ |
8 | file://include/jailhouse/hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ | 8 | file://include/jailhouse/hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ |
9 | file://include/jailhouse/cell-config.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ | 9 | file://include/jailhouse/cell-config.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ |
@@ -13,8 +13,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ | |||
13 | file://driver/jailhouse.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ | 13 | file://driver/jailhouse.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ |
14 | " | 14 | " |
15 | 15 | ||
16 | SRCBRANCH = "lf-5.15.71_2.2.0" | 16 | SRCBRANCH = "lf-6.1.1_1.0.0" |
17 | SRCREV = "d9fffb8035a8a2b8d1182c750bd0e90bb4c0027a" | 17 | SRCREV = "8faaeb45b989f6f74f0d56e6ae9aaddbf5ebfb06" |
18 | 18 | ||
19 | SRC_URI = "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https;branch=${SRCBRANCH}" | 19 | SRC_URI = "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https;branch=${SRCBRANCH}" |
20 | 20 | ||
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 | |||
545 | CONFIG_MEDIA_USB_SUPPORT=y | 545 | CONFIG_MEDIA_USB_SUPPORT=y |
546 | CONFIG_USB_VIDEO_CLASS=m | 546 | CONFIG_USB_VIDEO_CLASS=m |
547 | CONFIG_V4L_PLATFORM_DRIVERS=y | 547 | CONFIG_V4L_PLATFORM_DRIVERS=y |
548 | CONFIG_VIDEO_MXC_CAPTURE=y | 548 | CONFIG_VIDEO_MXC_CAPTURE=m |
549 | CONFIG_VIDEO_MX8_CAPTURE=y | 549 | CONFIG_VIDEO_MX8_CAPTURE=y |
550 | CONFIG_VIDEO_MXC_CSI_CAMERA=y | 550 | CONFIG_VIDEO_MXC_CSI_CAMERA=m |
551 | CONFIG_MXC_MIPI_CSI=y | 551 | CONFIG_MXC_MIPI_CSI=m |
552 | CONFIG_DWC_MIPI_CSI2_HOST=y | 552 | CONFIG_DWC_MIPI_CSI2_HOST=y |
553 | CONFIG_MXC_CAMERA_OV5640_MIPI_V2=y | 553 | CONFIG_MXC_CAMERA_OV5640_MIPI_V2=m |
554 | CONFIG_V4L_MEM2MEM_DRIVERS=y | 554 | CONFIG_V4L_MEM2MEM_DRIVERS=y |
555 | CONFIG_VIDEO_IMX8_JPEG=m | 555 | CONFIG_VIDEO_IMX8_JPEG=m |
556 | CONFIG_VIDEO_AMPHION_VPU=y | 556 | CONFIG_VIDEO_AMPHION_VPU=y |
@@ -856,6 +856,7 @@ CONFIG_STAGING_MEDIA=y | |||
856 | CONFIG_VIDEO_HANTRO=m | 856 | CONFIG_VIDEO_HANTRO=m |
857 | CONFIG_VIDEO_IMX_CAPTURE=y | 857 | CONFIG_VIDEO_IMX_CAPTURE=y |
858 | CONFIG_IMX8_MEDIA_DEVICE=m | 858 | CONFIG_IMX8_MEDIA_DEVICE=m |
859 | CONFIG_IMX8_MIPI_CSI2_YAV=m | ||
859 | CONFIG_MHDP_HDMIRX=y | 860 | CONFIG_MHDP_HDMIRX=y |
860 | CONFIG_MHDP_HDMIRX_CEC=y | 861 | CONFIG_MHDP_HDMIRX_CEC=y |
861 | CONFIG_FSL_DPAA2=y | 862 | 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 | |||
545 | CONFIG_MEDIA_USB_SUPPORT=y | 545 | CONFIG_MEDIA_USB_SUPPORT=y |
546 | CONFIG_USB_VIDEO_CLASS=m | 546 | CONFIG_USB_VIDEO_CLASS=m |
547 | CONFIG_V4L_PLATFORM_DRIVERS=y | 547 | CONFIG_V4L_PLATFORM_DRIVERS=y |
548 | CONFIG_VIDEO_MXC_CAPTURE=y | 548 | CONFIG_VIDEO_MXC_CAPTURE=m |
549 | CONFIG_VIDEO_MX8_CAPTURE=y | 549 | CONFIG_VIDEO_MX8_CAPTURE=y |
550 | CONFIG_VIDEO_MXC_CSI_CAMERA=y | 550 | CONFIG_VIDEO_MXC_CSI_CAMERA=m |
551 | CONFIG_MXC_MIPI_CSI=y | 551 | CONFIG_MXC_MIPI_CSI=m |
552 | CONFIG_DWC_MIPI_CSI2_HOST=y | 552 | CONFIG_DWC_MIPI_CSI2_HOST=y |
553 | CONFIG_MXC_CAMERA_OV5640_MIPI_V2=y | 553 | CONFIG_MXC_CAMERA_OV5640_MIPI_V2=m |
554 | CONFIG_V4L_MEM2MEM_DRIVERS=y | 554 | CONFIG_V4L_MEM2MEM_DRIVERS=y |
555 | CONFIG_VIDEO_IMX8_JPEG=m | 555 | CONFIG_VIDEO_IMX8_JPEG=m |
556 | CONFIG_VIDEO_AMPHION_VPU=y | 556 | CONFIG_VIDEO_AMPHION_VPU=y |
@@ -856,6 +856,7 @@ CONFIG_STAGING_MEDIA=y | |||
856 | CONFIG_VIDEO_HANTRO=m | 856 | CONFIG_VIDEO_HANTRO=m |
857 | CONFIG_VIDEO_IMX_CAPTURE=y | 857 | CONFIG_VIDEO_IMX_CAPTURE=y |
858 | CONFIG_IMX8_MEDIA_DEVICE=m | 858 | CONFIG_IMX8_MEDIA_DEVICE=m |
859 | CONFIG_IMX8_MIPI_CSI2_YAV=m | ||
859 | CONFIG_MHDP_HDMIRX=y | 860 | CONFIG_MHDP_HDMIRX=y |
860 | CONFIG_MHDP_HDMIRX_CEC=y | 861 | CONFIG_MHDP_HDMIRX_CEC=y |
861 | CONFIG_FSL_DPAA2=y | 862 | 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." | |||
12 | ############################################################################### | 12 | ############################################################################### |
13 | # This recipe (and corresponding kernel repository and branch) receives updates | 13 | # This recipe (and corresponding kernel repository and branch) receives updates |
14 | # from 3 different sources: | 14 | # from 3 different sources: |
15 | # 1. Stable [linux-5.15.y] branch updates of korg; | 15 | # 1. Stable [linux-6.1.y] branch updates of korg; |
16 | # 2. NXP-specific updates via branch [5.10-2.1.x-imx] shared via CodeAurora forum; | 16 | # 2. NXP-specific updates via branch [lf-6.1.y] shared via GitHub NXP repo; |
17 | # 3. Critical patches, which are not (yet) integrated into either of 2 above | 17 | # 3. Critical patches, which are not (yet) integrated into either of 2 above |
18 | # sources, but are required to be applied to the kernel tree. | 18 | # sources, but are required to be applied to the kernel tree. |
19 | # | 19 | # |
@@ -28,12 +28,12 @@ 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: v5.15.87 | 31 | # tag: v6.1.24 |
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-5.15.71-2.2.0 | 36 | # tag: lf-6.1.1-1.0.0 |
37 | # | 37 | # |
38 | # ------------------------------------------------------------------------------ | 38 | # ------------------------------------------------------------------------------ |
39 | # 3. Critical patches (SHA(s)) | 39 | # 3. Critical patches (SHA(s)) |
@@ -50,18 +50,18 @@ include linux-fslc.inc | |||
50 | LICENSE = "GPL-2.0-only" | 50 | LICENSE = "GPL-2.0-only" |
51 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 51 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
52 | 52 | ||
53 | KBRANCH = "5.15-2.2.x-imx" | 53 | KBRANCH = "6.1-1.0.x-imx" |
54 | SRCREV = "0eb4504bd3b8fd125e83ec62da9ba039519f96c8" | 54 | SRCREV = "897d73a656fe33d0c4549c5de1d07797f99d6871" |
55 | 55 | ||
56 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition | 56 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition |
57 | # required by kernel-yocto.bbclass. | 57 | # required by kernel-yocto.bbclass. |
58 | # | 58 | # |
59 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and | 59 | # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and |
60 | # should be updated once patchlevel is merged. | 60 | # should be updated once patchlevel is merged. |
61 | LINUX_VERSION = "5.15.87" | 61 | LINUX_VERSION = "6.1.24" |
62 | 62 | ||
63 | # Local version indicates the branch name in the NXP kernel tree where patches are collected from. | 63 | # Local version indicates the branch name in the NXP kernel tree where patches are collected from. |
64 | LOCALVERSION = "-5.15.87-2.2.0" | 64 | LOCALVERSION = "-6.1.24-1.0.0" |
65 | 65 | ||
66 | DEFAULT_PREFERENCE = "1" | 66 | DEFAULT_PREFERENCE = "1" |
67 | 67 | ||