From 9c6ac2e7b8487f3f1171a0a5913bfac2b40d50b3 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 30 Aug 2024 16:47:33 +0200 Subject: [PATCH] linux-dey: add recipe for version 6.6 restricted to ccimx91 While on it, restrict recipe version 6.1 to ccimx93 so it does not get used by ccimx91. Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/include/digi-defaults.inc | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb | 4 +--- meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb | 12 ++++++++++++ 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index ef047ddc7..c29cf6401 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -16,7 +16,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" # ccimx8x 5.15 2020.04 (packaged in imx-boot) # ccimx8mn 5.15 2020.04 (packaged in imx-boot) # ccimx8mm 5.15 2020.04 (packaged in imx-boot) -# ccimx91 6.1 2023.04 (packaged in imx-boot) +# ccimx91 6.6 2024.04 (packaged in imx-boot) # ccimx93 6.1 2023.04 (packaged in imx-boot) # ccmp15 5.15 2021.10 # ccmp13 5.15 2021.10 diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb index 781d9829a..5462d2f2d 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb @@ -30,8 +30,6 @@ SRCREV = "${AUTOREV}" KERNEL_MODULE_PROBECONF += "btnxpuart" module_conf_btnxpuart = "blacklist btnxpuart" -COMPATIBLE_MACHINE = "(ccimx9)" - # --------------------------------------------------------------------- # stub for devicetree which are located on digi directory do_install:prepend:ccmp2() { @@ -52,4 +50,4 @@ do_install:append:ccmp2() { FILES:${KERNEL_PACKAGE_NAME}-modules:ccmp2 += "${sysconfdir}/modprobe.d" -COMPATIBLE_MACHINE = "(ccimx9|ccmp2)" +COMPATIBLE_MACHINE = "(ccimx93|ccmp2)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb new file mode 100644 index 000000000..ee482354e --- /dev/null +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb @@ -0,0 +1,12 @@ +# Copyright (C) 2024, Digi International Inc. + +require recipes-kernel/linux/linux-dey.inc + +SRCBRANCH = "v6.6.23/nxp/master" +SRCREV = "${AUTOREV}" + +# Blacklist btnxpuart module. It will be managed by the bluetooth-init script +KERNEL_MODULE_PROBECONF += "btnxpuart" +module_conf_btnxpuart = "blacklist btnxpuart" + +COMPATIBLE_MACHINE = "(ccimx91)"