From be66a2475794a8909b8e2e914474055b65bb5727 Mon Sep 17 00:00:00 2001 From: Christian Kohn Date: Fri, 27 Jan 2023 11:43:01 -0800 Subject: kernel-module-hdmi: Update SRCREV for 6.1 kernel The SRCREV of the hdmi kernel module was updated to compile with a 6.1 kernel. Also update the version variable inside the recipe and remove the 2022.2 version of the recipe as it is no longer compatible. Signed-off-by: Christian Kohn Signed-off-by: Mark Hatle --- .../hdmi/kernel-module-hdmi_2022.2.bb | 24 ---------------------- .../hdmi/kernel-module-hdmi_2023.1.bb | 6 +++--- 2 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.2.bb diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.2.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.2.bb deleted file mode 100644 index c1f66013..00000000 --- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.2.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Xilinx HDMI Linux Kernel module" -DESCRIPTION = "Out-of-tree HDMI kernel modules provider for MPSoC EG/EV devices" -SECTION = "kernel/modules" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe" - -XLNX_HDMI_VERSION = "5.15.19" -PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}" - -S = "${WORKDIR}/git" - -BRANCH ?= "xlnx_rel_v2022.2" -REPO ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https" -SRCREV = "25b6fe7a26a975be15c002b48cfd4c291486491e" - -BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" -SRC_URI = "${REPO};${BRANCHARG}" - -inherit module - -EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}" -COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE:zynqmp = "zynqmp" -COMPATIBLE_MACHINE:versal = "versal" diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.1.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.1.bb index 0f84dbde..6e00b6fd 100644 --- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.1.bb +++ b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.1.bb @@ -4,14 +4,14 @@ SECTION = "kernel/modules" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe" -XLNX_HDMI_VERSION = "5.15.19" -PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}" +XLNX_HDMI_VERSION = "6.1" +PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}" S = "${WORKDIR}/git" BRANCH ?= "master" REPO ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https" -SRCREV = "320153961a4b67795f8252ac8964f8c7919a39ca" +SRCREV = "1c6330f02fea68992e22400fdbc8c0d0e63e2958" BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" SRC_URI = "${REPO};${BRANCHARG}" -- cgit v1.2.3-54-g00ecf