From 14c284eb5361bd5e7526061ec03a109e2698d08a Mon Sep 17 00:00:00 2001 From: Luan Rafael Carneiro Date: Fri, 12 Apr 2024 16:09:44 -0300 Subject: linux-fslc-imx: Update from v6.1 to v6.6 Update linux-fslc-imx from version 6.1 to 6.6. This commit also changes 32-bit imx based machines to add device tree subdirectory. The changed machines are: - conf/machine/imx6qdlsabreauto.conf - conf/machine/imx6qdlsabresd.conf - conf/machine/imx6slevk.conf - conf/machine/imx6sllevk.conf - conf/machine/imx6sxsabreauto.conf - conf/machine/imx6sxsabresd.conf - conf/machine/imx6ulevk.conf - conf/machine/imx6ullevk.conf - conf/machine/imx6ulz-14x14-evk.conf - conf/machine/imx7dsabresd.conf - conf/machine/imx7ulpevk.conf Signed-off-by: Luan Rafael Carneiro --- conf/machine/imx6qdlsabreauto.conf | 26 ++++++---- conf/machine/imx6qdlsabresd.conf | 30 +++++------ conf/machine/imx6slevk.conf | 10 ++-- conf/machine/imx6sllevk.conf | 6 +-- conf/machine/imx6sxsabreauto.conf | 4 +- conf/machine/imx6sxsabresd.conf | 22 ++++---- conf/machine/imx6ulevk.conf | 18 +++---- conf/machine/imx6ullevk.conf | 8 +-- conf/machine/imx6ulz-14x14-evk.conf | 8 +-- conf/machine/imx7dsabresd.conf | 22 ++++---- conf/machine/imx7ulpevk.conf | 24 ++++----- recipes-kernel/linux/linux-fslc-imx_6.1.bb | 80 ------------------------------ recipes-kernel/linux/linux-fslc-imx_6.6.bb | 78 +++++++++++++++++++++++++++++ 13 files changed, 171 insertions(+), 165 deletions(-) delete mode 100644 recipes-kernel/linux/linux-fslc-imx_6.1.bb create mode 100644 recipes-kernel/linux/linux-fslc-imx_6.6.bb diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf index eb5215790..61d81ab69 100644 --- a/conf/machine/imx6qdlsabreauto.conf +++ b/conf/machine/imx6qdlsabreauto.conf @@ -17,19 +17,27 @@ require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv7a/tune-cortexa9.inc KERNEL_DEVICETREE = " \ - imx6qp-sabreauto.dtb imx6qp-sabreauto-ecspi.dtb imx6qp-sabreauto-flexcan1.dtb \ - imx6qp-sabreauto-gpmi-weim.dtb \ + nxp/imx/imx6qp-sabreauto.dtb \ + nxp/imx/imx6qp-sabreauto-ecspi.dtb \ + nxp/imx/imx6qp-sabreauto-flexcan1.dtb \ + nxp/imx/imx6qp-sabreauto-gpmi-weim.dtb \ \ - imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb imx6q-sabreauto-ecspi.dtb \ - imx6q-sabreauto-flexcan1.dtb imx6q-sabreauto-enetirq.dtb \ + nxp/imx/imx6q-sabreauto.dtb \ + nxp/imx/imx6q-sabreauto-gpmi-weim.dtb \ + nxp/imx/imx6q-sabreauto-ecspi.dtb \ + nxp/imx/imx6q-sabreauto-flexcan1.dtb \ + nxp/imx/imx6q-sabreauto-enetirq.dtb \ \ - imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb \ - imx6dl-sabreauto-flexcan1.dtb imx6dl-sabreauto-enetirq.dtb \ + nxp/imx/imx6dl-sabreauto.dtb \ + nxp/imx/imx6dl-sabreauto-gpmi-weim.dtb \ + nxp/imx/imx6dl-sabreauto-ecspi.dtb \ + nxp/imx/imx6dl-sabreauto-flexcan1.dtb \ + nxp/imx/imx6dl-sabreauto-enetirq.dtb \ " KERNEL_DEVICETREE:use-mainline-bsp = " \ - imx6qp-sabreauto.dtb \ - imx6q-sabreauto.dtb \ - imx6dl-sabreauto.dtb \ + nxp/imx/imx6qp-sabreauto.dtb \ + nxp/imx/imx6q-sabreauto.dtb \ + nxp/imx/imx6dl-sabreauto.dtb \ " UBOOT_CONFIG ??= " \ diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf index 6db042545..1ab1d9df8 100644 --- a/conf/machine/imx6qdlsabresd.conf +++ b/conf/machine/imx6qdlsabresd.conf @@ -17,23 +17,23 @@ require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv7a/tune-cortexa9.inc KERNEL_DEVICETREE = " \ - imx6qp-sabresd-btwifi.dtb \ - imx6qp-sabresd.dtb \ - imx6qp-sabresd-hdcp.dtb \ - imx6qp-sabresd-ldo.dtb \ + nxp/imx/imx6qp-sabresd-btwifi.dtb \ + nxp/imx/imx6qp-sabresd.dtb \ + nxp/imx/imx6qp-sabresd-hdcp.dtb \ + nxp/imx/imx6qp-sabresd-ldo.dtb \ \ - imx6q-sabresd-btwifi.dtb \ - imx6q-sabresd.dtb \ - imx6q-sabresd-enetirq.dtb \ - imx6q-sabresd-hdcp.dtb \ - imx6q-sabresd-ldo.dtb \ - imx6q-sabresd-uart.dtb \ + nxp/imx/imx6q-sabresd-btwifi.dtb \ + nxp/imx/imx6q-sabresd.dtb \ + nxp/imx/imx6q-sabresd-enetirq.dtb \ + nxp/imx/imx6q-sabresd-hdcp.dtb \ + nxp/imx/imx6q-sabresd-ldo.dtb \ + nxp/imx/imx6q-sabresd-uart.dtb \ \ - imx6dl-sabresd-btwifi.dtb \ - imx6dl-sabresd.dtb \ - imx6dl-sabresd-enetirq.dtb \ - imx6dl-sabresd-hdcp.dtb \ - imx6dl-sabresd-ldo.dtb \ + nxp/imx/imx6dl-sabresd-btwifi.dtb \ + nxp/imx/imx6dl-sabresd.dtb \ + nxp/imx/imx6dl-sabresd-enetirq.dtb \ + nxp/imx/imx6dl-sabresd-hdcp.dtb \ + nxp/imx/imx6dl-sabresd-ldo.dtb \ " KERNEL_DEVICETREE:use-mainline-bsp = " \ nxp/imx/imx6qp-sabresd.dtb \ diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf index 601fa3036..af196eab8 100644 --- a/conf/machine/imx6slevk.conf +++ b/conf/machine/imx6slevk.conf @@ -9,12 +9,12 @@ MACHINEOVERRIDES =. "mx6sl:" include conf/machine/include/imx-base.inc require conf/machine/include/arm/armv7a/tune-cortexa9.inc -KERNEL_DEVICETREE = "imx6sl-evk.dtb" +KERNEL_DEVICETREE = "nxp/imx/imx6sl-evk.dtb" KERNEL_DEVICETREE:append:use-nxp-bsp = " \ - imx6sl-evk-btwifi.dtb \ - imx6sl-evk-csi.dtb \ - imx6sl-evk-ldo.dtb \ - imx6sl-evk-uart.dtb \ + nxp/imx/imx6sl-evk-btwifi.dtb \ + nxp/imx/imx6sl-evk-csi.dtb \ + nxp/imx/imx6sl-evk-ldo.dtb \ + nxp/imx/imx6sl-evk-uart.dtb \ " UBOOT_MAKE_TARGET = "u-boot.imx" diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf index 96f077cb3..5a1dc666c 100644 --- a/conf/machine/imx6sllevk.conf +++ b/conf/machine/imx6sllevk.conf @@ -9,10 +9,10 @@ MACHINEOVERRIDES =. "mx6sll:" include conf/machine/include/imx-base.inc require conf/machine/include/arm/armv7a/tune-cortexa9.inc -KERNEL_DEVICETREE = "imx6sll-evk.dtb" +KERNEL_DEVICETREE = "nxp/imx/imx6sll-evk.dtb" KERNEL_DEVICETREE:append:use-nxp-bsp = " \ - imx6sll-evk-btwifi.dtb \ - imx6sll-evk-reva.dtb" + nxp/imx/imx6sll-evk-btwifi.dtb \ + nxp/imx/imx6sll-evk-reva.dtb" UBOOT_MAKE_TARGET = "u-boot.imx" UBOOT_SUFFIX = "imx" diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf index e51d5d49a..cbb20d567 100644 --- a/conf/machine/imx6sxsabreauto.conf +++ b/conf/machine/imx6sxsabreauto.conf @@ -9,8 +9,8 @@ MACHINEOVERRIDES =. "mx6sx:" require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv7a/tune-cortexa9.inc -KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb" -KERNEL_DEVICETREE:use-mainline-bsp = "imx6sx-sabreauto.dtb" +KERNEL_DEVICETREE = "nxp/imx/imx6sx-sabreauto.dtb" +KERNEL_DEVICETREE:use-mainline-bsp = "nxp/imx/imx6sx-sabreauto.dtb" UBOOT_MAKE_TARGET = "u-boot.imx" UBOOT_SUFFIX = "imx" diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf index 56e2ac9d9..8d597c551 100644 --- a/conf/machine/imx6sxsabresd.conf +++ b/conf/machine/imx6sxsabresd.conf @@ -10,19 +10,19 @@ require conf/machine/include/imx-base.inc require conf/machine/include/arm/armv7a/tune-cortexa9.inc KERNEL_DEVICETREE = " \ - imx6sx-sdb.dtb \ - imx6sx-sdb-reva.dtb \ - imx6sx-sdb-sai.dtb \ + nxp/imx/imx6sx-sdb.dtb \ + nxp/imx/imx6sx-sdb-reva.dtb \ + nxp/imx/imx6sx-sdb-sai.dtb \ " KERNEL_DEVICETREE:append:use-nxp-bsp = " \ - imx6sx-sdb-btwifi.dtb \ - imx6sx-sdb-emmc.dtb \ - imx6sx-sdb-lcdif1.dtb \ - imx6sx-sdb-ldo.dtb \ - imx6sx-sdb-m4.dtb \ - imx6sx-sdb-mqs.dtb \ - imx6sx-sdb-pcie-ep.dtb \ - imx6sx-sdb-reva-ldo.dtb \ + nxp/imx/imx6sx-sdb-btwifi.dtb \ + nxp/imx/imx6sx-sdb-emmc.dtb \ + nxp/imx/imx6sx-sdb-lcdif1.dtb \ + nxp/imx/imx6sx-sdb-ldo.dtb \ + nxp/imx/imx6sx-sdb-m4.dtb \ + nxp/imx/imx6sx-sdb-mqs.dtb \ + nxp/imx/imx6sx-sdb-pcie-ep.dtb \ + nxp/imx/imx6sx-sdb-reva-ldo.dtb \ " UBOOT_MAKE_TARGET = "u-boot.imx" diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf index 5be340bda..b06e30316 100644 --- a/conf/machine/imx6ulevk.conf +++ b/conf/machine/imx6ulevk.conf @@ -12,16 +12,16 @@ include conf/machine/include/arm/armv7a/tune-cortexa7.inc MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" KERNEL_DEVICETREE = " \ - imx6ul-14x14-evk-btwifi.dtb \ - imx6ul-14x14-evk-btwifi-sdio3_0.dtb \ - imx6ul-14x14-evk-csi.dtb \ - imx6ul-14x14-evk.dtb \ - imx6ul-14x14-evk-ecspi.dtb \ - imx6ul-14x14-evk-ecspi-slave.dtb \ - imx6ul-14x14-evk-emmc.dtb \ - imx6ul-14x14-evk-gpmi-weim.dtb \ + nxp/imx/imx6ul-14x14-evk-btwifi.dtb \ + nxp/imx/imx6ul-14x14-evk-btwifi-sdio3_0.dtb \ + nxp/imx/imx6ul-14x14-evk-csi.dtb \ + nxp/imx/imx6ul-14x14-evk.dtb \ + nxp/imx/imx6ul-14x14-evk-ecspi.dtb \ + nxp/imx/imx6ul-14x14-evk-ecspi-slave.dtb \ + nxp/imx/imx6ul-14x14-evk-emmc.dtb \ + nxp/imx/imx6ul-14x14-evk-gpmi-weim.dtb \ " -KERNEL_DEVICETREE:use-mainline-bsp = "imx6ul-14x14-evk.dtb" +KERNEL_DEVICETREE:use-mainline-bsp = "nxp/imx/imx6ul-14x14-evk.dtb" ### u-boot-fslc settings ### diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf index 60668c2fa..a8d76a2ce 100644 --- a/conf/machine/imx6ullevk.conf +++ b/conf/machine/imx6ullevk.conf @@ -12,13 +12,13 @@ include conf/machine/include/arm/armv7a/tune-cortexa7.inc MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8801-sdio nxp8987-sdio" KERNEL_DEVICETREE = " \ - imx6ull-14x14-evk.dtb \ + nxp/imx/imx6ull-14x14-evk.dtb \ " KERNEL_DEVICETREE:append:use-nxp-bsp = " \ - imx6ull-14x14-evk-btwifi.dtb \ - imx6ull-14x14-evk-emmc.dtb \ - imx6ull-14x14-evk-gpmi-weim.dtb \ + nxp/imx/imx6ull-14x14-evk-btwifi.dtb \ + nxp/imx/imx6ull-14x14-evk-emmc.dtb \ + nxp/imx/imx6ull-14x14-evk-gpmi-weim.dtb \ " UBOOT_MAKE_TARGET = "u-boot.imx" diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf index 6cb1698db..d1dcae99e 100644 --- a/conf/machine/imx6ulz-14x14-evk.conf +++ b/conf/machine/imx6ulz-14x14-evk.conf @@ -12,12 +12,12 @@ include conf/machine/include/arm/armv7a/tune-cortexa7.inc MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" KERNEL_DEVICETREE = " \ - imx6ulz-14x14-evk.dtb \ + nxp/imx/imx6ulz-14x14-evk.dtb \ " KERNEL_DEVICETREE:append:use-nxp-bsp = " \ - imx6ulz-14x14-evk-btwifi.dtb \ - imx6ulz-14x14-evk-emmc.dtb \ - imx6ulz-14x14-evk-gpmi-weim.dtb \ + nxp/imx/imx6ulz-14x14-evk-btwifi.dtb \ + nxp/imx/imx6ulz-14x14-evk-emmc.dtb \ + nxp/imx/imx6ulz-14x14-evk-gpmi-weim.dtb \ " UBOOT_MAKE_TARGET = "u-boot.imx" diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf index 7bea7b837..4b4a60122 100644 --- a/conf/machine/imx7dsabresd.conf +++ b/conf/machine/imx7dsabresd.conf @@ -11,18 +11,18 @@ include conf/machine/include/arm/armv7a/tune-cortexa7.inc MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455 nxp8987-sdio" -KERNEL_DEVICETREE = "imx7d-sdb.dtb" +KERNEL_DEVICETREE = "nxp/imx/imx7d-sdb.dtb" KERNEL_DEVICETREE:append:use-nxp-bsp = " \ - imx7d-sdb-epdc.dtb \ - imx7d-sdb-gpmi-weim.dtb \ - imx7d-sdb-m4.dtb \ - imx7d-sdb-mipi-dsi.dtb \ - imx7d-sdb-mqs.dtb \ - imx7d-sdb-pcie-ep.dtb \ - imx7d-sdb-qspi.dtb \ - imx7d-sdb-reva.dtb \ - imx7d-sdb-sht11.dtb \ - imx7d-sdb-usd-wifi.dtb \ + nxp/imx/imx7d-sdb-epdc.dtb \ + nxp/imx/imx7d-sdb-gpmi-weim.dtb \ + nxp/imx/imx7d-sdb-m4.dtb \ + nxp/imx/imx7d-sdb-mipi-dsi.dtb \ + nxp/imx/imx7d-sdb-mqs.dtb \ + nxp/imx/imx7d-sdb-pcie-ep.dtb \ + nxp/imx/imx7d-sdb-qspi.dtb \ + nxp/imx/imx7d-sdb-reva.dtb \ + nxp/imx/imx7d-sdb-sht11.dtb \ + nxp/imx/imx7d-sdb-usd-wifi.dtb \ " UBOOT_MAKE_TARGET = "u-boot.imx" diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf index 6825669fa..2e39a0c79 100644 --- a/conf/machine/imx7ulpevk.conf +++ b/conf/machine/imx7ulpevk.conf @@ -12,20 +12,20 @@ include conf/machine/include/arm/armv7a/tune-cortexa7.inc MACHINE_FEATURES += "pci wifi bluetooth bcm43430 nxp8987-sdio" KERNEL_DEVICETREE = " \ - imx7ulp-evk.dtb \ + nxp/imx/imx7ulp-evk.dtb \ " KERNEL_DEVICETREE:append:use-nxp-bsp = " \ - imx7ulp-evk-ft5416.dtb \ - imx7ulp-evk-mipi.dtb \ - imx7ulp-evkb.dtb \ - imx7ulp-evkb-emmc.dtb \ - imx7ulp-evkb-lpuart.dtb \ - imx7ulp-evkb-mipi.dtb \ - imx7ulp-evkb-rm68191-qhd.dtb \ - imx7ulp-evkb-rm68200-wxga.dtb \ - imx7ulp-evkb-sd1.dtb \ - imx7ulp-evkb-sensors-to-i2c5.dtb \ - imx7ulp-evkb-spi-slave.dtb \ + nxp/imx/imx7ulp-evk-ft5416.dtb \ + nxp/imx/imx7ulp-evk-mipi.dtb \ + nxp/imx/imx7ulp-evkb.dtb \ + nxp/imx/imx7ulp-evkb-emmc.dtb \ + nxp/imx/imx7ulp-evkb-lpuart.dtb \ + nxp/imx/imx7ulp-evkb-mipi.dtb \ + nxp/imx/imx7ulp-evkb-rm68191-qhd.dtb \ + nxp/imx/imx7ulp-evkb-rm68200-wxga.dtb \ + nxp/imx/imx7ulp-evkb-sd1.dtb \ + nxp/imx/imx7ulp-evkb-sensors-to-i2c5.dtb \ + nxp/imx/imx7ulp-evkb-spi-slave.dtb \ " UBOOT_MAKE_TARGET = "u-boot.imx" diff --git a/recipes-kernel/linux/linux-fslc-imx_6.1.bb b/recipes-kernel/linux/linux-fslc-imx_6.1.bb deleted file mode 100644 index 1d6fdf342..000000000 --- a/recipes-kernel/linux/linux-fslc-imx_6.1.bb +++ /dev/null @@ -1,80 +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-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.70 -# -# ------------------------------------------------------------------------------ -# 2. NXP-specific (tag or SHA(s)) -# ------------------------------------------------------------------------------ -# tag: lf-6.1.55-2.2.0 -# -# ------------------------------------------------------------------------------ -# 3. Critical patches (SHA(s)) -# ------------------------------------------------------------------------------ -# - 77a660738af5 Revert "net: stmmac: fix FPE events losing" -# - d9e9cb8ce9bc hx280enc_vc8000e: fix misplaced #endif -# - 3f1f2ea72955 mxc: gpu-viv: change _QuerySignal() return type to gceSTATUS -# - b73c6797ee42 ARM: imx_v7_defconfig: Remove KERNEL_LZO config -# - ec33c7fc43be touchscreen: Kconfig: add I2C dependency for CT36X -# - 6c41233a2cfb pwm: pwm-adp5585: fix get_state callback prototype -# - 9c7540ecb891 pwm: pwm-rpmsg-imx: fix get_state callback prototype -# -# 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. -############################################################################### - -require linux-imx.inc - -KERNEL_DEVICETREE_32BIT_COMPATIBILITY_UPDATE = "1" - -KBRANCH = "6.1-2.2.x-imx" -SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" -SRCREV = "2bfda7392e6621dd9060f87d7f9d601bb1906dbf" - -# 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.70" - -KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" -KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" -KBUILD_DEFCONFIG:mx8-generic-bsp = "imx_v8_defconfig" -KBUILD_DEFCONFIG:mx9-generic-bsp = "imx_v8_defconfig" - -# Local version indicates the branch name in the NXP kernel tree where patches are collected from. -LOCALVERSION = "-lf-6.1.y" - -DEFAULT_PREFERENCE = "1" - -COMPATIBLE_MACHINE = "(imx-nxp-bsp)" diff --git a/recipes-kernel/linux/linux-fslc-imx_6.6.bb b/recipes-kernel/linux/linux-fslc-imx_6.6.bb new file mode 100644 index 000000000..6e31c1e2a --- /dev/null +++ b/recipes-kernel/linux/linux-fslc-imx_6.6.bb @@ -0,0 +1,78 @@ +# 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.70 +# +# ------------------------------------------------------------------------------ +# 2. NXP-specific (tag or SHA(s)) +# ------------------------------------------------------------------------------ +# tag: lf-6.1.55-2.2.0 +# +# ------------------------------------------------------------------------------ +# 3. Critical patches (SHA(s)) +# ------------------------------------------------------------------------------ +# - 77a660738af5 Revert "net: stmmac: fix FPE events losing" +# - d9e9cb8ce9bc hx280enc_vc8000e: fix misplaced #endif +# - 3f1f2ea72955 mxc: gpu-viv: change _QuerySignal() return type to gceSTATUS +# - b73c6797ee42 ARM: imx_v7_defconfig: Remove KERNEL_LZO config +# - ec33c7fc43be touchscreen: Kconfig: add I2C dependency for CT36X +# - 6c41233a2cfb pwm: pwm-adp5585: fix get_state callback prototype +# - 9c7540ecb891 pwm: pwm-rpmsg-imx: fix get_state callback prototype +# +# 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. +############################################################################### + +require linux-imx.inc + +KBRANCH = "6.6-1.0.x-imx" +SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https" +SRCREV = "ccf0a99701a701fb48a04e31ffe3f9d585a8374a" + +# 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.6.3" + +KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" +KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" +KBUILD_DEFCONFIG:mx8-generic-bsp = "imx_v8_defconfig" +KBUILD_DEFCONFIG:mx9-generic-bsp = "imx_v8_defconfig" + +# Local version indicates the branch name in the NXP kernel tree where patches are collected from. +LOCALVERSION = "-lf-6.6.y" + +DEFAULT_PREFERENCE = "1" + +COMPATIBLE_MACHINE = "(imx-nxp-bsp)" -- cgit v1.2.3-54-g00ecf From f6e23a3f3a3c4c54022e4d4d47324219beb37527 Mon Sep 17 00:00:00 2001 From: Luan Rafael Carneiro Date: Fri, 12 Apr 2024 16:58:55 -0300 Subject: linux-imx: Bump from v6.1.55-2.2.0 to v6.6.3-1.0.0 Signed-off-by: Luan Rafael Carneiro --- recipes-kernel/linux/linux-imx_6.1.bb | 35 ----------------------------------- recipes-kernel/linux/linux-imx_6.6.bb | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 35 deletions(-) delete mode 100644 recipes-kernel/linux/linux-imx_6.1.bb create mode 100644 recipes-kernel/linux/linux-imx_6.6.bb diff --git a/recipes-kernel/linux/linux-imx_6.1.bb b/recipes-kernel/linux/linux-imx_6.1.bb deleted file mode 100644 index 6b93a1d08..000000000 --- a/recipes-kernel/linux/linux-imx_6.1.bb +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2013-2016 (C) Freescale Semiconductor -# Copyright 2017-2023 (C) NXP -# Copyright 2018 (C) O.S. Systems Software LTDA. -# Released under the MIT license (see COPYING.MIT for the terms) -# -# SPDX-License-Identifier: MIT -# - -SUMMARY = "Linux Kernel provided and supported by NXP" -DESCRIPTION = "Linux Kernel provided and supported by NXP with focus on \ -i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU and IPU." - -require recipes-kernel/linux/linux-imx.inc - -KERNEL_DEVICETREE_32BIT_COMPATIBILITY_UPDATE = "1" - -SRCBRANCH = "lf-6.1.y" -LOCALVERSION = "-6.1.55-2.2.0" -SRCREV = "770c5fe2c1d1529fae21b7043911cd50c6cf087e" - -# 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.55" - -KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" -KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" -KBUILD_DEFCONFIG:mx8-generic-bsp = "imx_v8_defconfig" -KBUILD_DEFCONFIG:mx9-generic-bsp = "imx_v8_defconfig" - -DEFAULT_PREFERENCE = "1" - -COMPATIBLE_MACHINE = "(imx-nxp-bsp)" diff --git a/recipes-kernel/linux/linux-imx_6.6.bb b/recipes-kernel/linux/linux-imx_6.6.bb new file mode 100644 index 000000000..409e1f662 --- /dev/null +++ b/recipes-kernel/linux/linux-imx_6.6.bb @@ -0,0 +1,33 @@ +# Copyright 2013-2016 (C) Freescale Semiconductor +# Copyright 2017-2023 (C) NXP +# Copyright 2018 (C) O.S. Systems Software LTDA. +# Released under the MIT license (see COPYING.MIT for the terms) +# +# SPDX-License-Identifier: MIT +# + +SUMMARY = "Linux Kernel provided and supported by NXP" +DESCRIPTION = "Linux Kernel provided and supported by NXP with focus on \ +i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU and IPU." + +require recipes-kernel/linux/linux-imx.inc + +SRCBRANCH = "lf-6.6.y" +LOCALVERSION = "-6.6.3-1.0.0" +SRCREV = "ccf0a99701a701fb48a04e31ffe3f9d585a8374a" + +# 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.6.3" + +KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig" +KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig" +KBUILD_DEFCONFIG:mx8-generic-bsp = "imx_v8_defconfig" +KBUILD_DEFCONFIG:mx9-generic-bsp = "imx_v8_defconfig" + +DEFAULT_PREFERENCE = "1" + +COMPATIBLE_MACHINE = "(imx-nxp-bsp)" -- cgit v1.2.3-54-g00ecf From 84e9ff2de0e1a24f85c45789cef60fa1667af1ff Mon Sep 17 00:00:00 2001 From: Luan Rafael Carneiro Date: Fri, 12 Apr 2024 17:23:27 -0300 Subject: linux-imx-headers: Update from v6.1.55-2.2.0 to v6.6.3-1.0.0 Signed-off-by: Luan Rafael Carneiro --- recipes-kernel/linux/linux-imx-headers_6.1.bb | 78 --------------------------- recipes-kernel/linux/linux-imx-headers_6.6.bb | 78 +++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 78 deletions(-) delete mode 100644 recipes-kernel/linux/linux-imx-headers_6.1.bb create mode 100644 recipes-kernel/linux/linux-imx-headers_6.6.bb diff --git a/recipes-kernel/linux/linux-imx-headers_6.1.bb b/recipes-kernel/linux/linux-imx-headers_6.1.bb deleted file mode 100644 index e2e63efca..000000000 --- a/recipes-kernel/linux/linux-imx-headers_6.1.bb +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 2017-2023 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "Installs i.MX-specific kernel headers" -DESCRIPTION = "Installs i.MX-specific kernel headers to userspace. \ -New headers are installed in ${includedir}/imx." -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - -SRC_URI = "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" -SRCBRANCH = "lf-6.1.y" -LOCALVERSION = "-6.1.55-2.2.0" -SRCREV = "770c5fe2c1d1529fae21b7043911cd50c6cf087e" - -S = "${WORKDIR}/git" - -do_configure[noexec] = "1" - -do_compile[noexec] = "1" - -IMX_UAPI_HEADERS = " \ - dma-buf.h \ - hantrodec.h \ - hx280enc.h \ - ipu.h \ - imx_vpu.h \ - mxc_asrc.h \ - mxc_dcic.h \ - mxc_mlb.h \ - mxc_sim_interface.h \ - mxc_v4l2.h \ - mxcfb.h \ - pxp_device.h \ - pxp_dma.h \ - version.h \ - videodev2.h \ -" - -do_install() { - # We install all headers inside of B so we can copy only the - # i.MX-specific ones, and there is no risk of a new header to be - # installed by mistake. - oe_runmake headers_install INSTALL_HDR_PATH=${B}${exec_prefix} - - ################################################ - # BEGIN Copy of exceptional logic from linux-libc-headers - # Kernel should not be exporting this header - rm -f ${B}${exec_prefix}/include/scsi/scsi.h - - # The ..install.cmd conflicts between various configure runs - find ${B}${includedir} -name ..install.cmd | xargs rm -f - # END Copy from linux-libc-headers - ################################################ - - # Install i.MX-specific headers only - for h in ${IMX_UAPI_HEADERS}; do - install -D -m 0644 ${B}${includedir}/linux/$h \ - ${D}${includedir}/imx/linux/$h - done -} - -# Allow to build empty main package, this is required in order for -dev package -# to be propagated into the SDK -# -# Without this setting the RDEPENDS in other recipes fails to find this -# package, therefore causing the -dev package also to be skipped effectively not -# populating it into SDK -ALLOW_EMPTY:${PN} = "1" - -INHIBIT_DEFAULT_DEPS = "1" -DEPENDS += "unifdef-native bison-native rsync-native" - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" - -# Restrict this recipe to NXP BSP only, this recipe is not compatible -# with mainline BSP -COMPATIBLE_HOST = '(null)' -COMPATIBLE_HOST:use-nxp-bsp = '.*' diff --git a/recipes-kernel/linux/linux-imx-headers_6.6.bb b/recipes-kernel/linux/linux-imx-headers_6.6.bb new file mode 100644 index 000000000..95ec32b04 --- /dev/null +++ b/recipes-kernel/linux/linux-imx-headers_6.6.bb @@ -0,0 +1,78 @@ +# Copyright 2017-2023 NXP +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Installs i.MX-specific kernel headers" +DESCRIPTION = "Installs i.MX-specific kernel headers to userspace. \ +New headers are installed in ${includedir}/imx." +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +SRC_URI = "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" +SRCBRANCH = "lf-6.6.y" +LOCALVERSION = "-6.6.3-1.0.0" +SRCREV = "ccf0a99701a701fb48a04e31ffe3f9d585a8374a" + +S = "${WORKDIR}/git" + +do_configure[noexec] = "1" + +do_compile[noexec] = "1" + +IMX_UAPI_HEADERS = " \ + dma-buf.h \ + hantrodec.h \ + hx280enc.h \ + ipu.h \ + imx_vpu.h \ + mxc_asrc.h \ + mxc_dcic.h \ + mxc_mlb.h \ + mxc_sim_interface.h \ + mxc_v4l2.h \ + mxcfb.h \ + pxp_device.h \ + pxp_dma.h \ + version.h \ + videodev2.h \ +" + +do_install() { + # We install all headers inside of B so we can copy only the + # i.MX-specific ones, and there is no risk of a new header to be + # installed by mistake. + oe_runmake headers_install INSTALL_HDR_PATH=${B}${exec_prefix} + + ################################################ + # BEGIN Copy of exceptional logic from linux-libc-headers + # Kernel should not be exporting this header + rm -f ${B}${exec_prefix}/include/scsi/scsi.h + + # The ..install.cmd conflicts between various configure runs + find ${B}${includedir} -name ..install.cmd | xargs rm -f + # END Copy from linux-libc-headers + ################################################ + + # Install i.MX-specific headers only + for h in ${IMX_UAPI_HEADERS}; do + install -D -m 0644 ${B}${includedir}/linux/$h \ + ${D}${includedir}/imx/linux/$h + done +} + +# Allow to build empty main package, this is required in order for -dev package +# to be propagated into the SDK +# +# Without this setting the RDEPENDS in other recipes fails to find this +# package, therefore causing the -dev package also to be skipped effectively not +# populating it into SDK +ALLOW_EMPTY:${PN} = "1" + +INHIBIT_DEFAULT_DEPS = "1" +DEPENDS += "unifdef-native bison-native rsync-native" + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" + +# Restrict this recipe to NXP BSP only, this recipe is not compatible +# with mainline BSP +COMPATIBLE_HOST = '(null)' +COMPATIBLE_HOST:use-nxp-bsp = '.*' -- cgit v1.2.3-54-g00ecf