summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kohn <chris.kohn@amd.com>2023-01-27 11:43:01 -0800
committerMark Hatle <mark.hatle@amd.com>2023-01-27 13:59:30 -0600
commitbe66a2475794a8909b8e2e914474055b65bb5727 (patch)
tree47bce8eaf7cc89906d0800ac89e7177af436bb53
parent80005c7068fc9654281047a461c60a1f2eb566c2 (diff)
downloadmeta-xilinx-be66a2475794a8909b8e2e914474055b65bb5727.tar.gz
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 <chris.kohn@amd.com> Signed-off-by: Mark Hatle <mark.hatle@amd.com>
-rw-r--r--meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.2.bb24
-rw-r--r--meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.1.bb6
2 files changed, 3 insertions, 27 deletions
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 @@
1SUMMARY = "Xilinx HDMI Linux Kernel module"
2DESCRIPTION = "Out-of-tree HDMI kernel modules provider for MPSoC EG/EV devices"
3SECTION = "kernel/modules"
4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe"
6
7XLNX_HDMI_VERSION = "5.15.19"
8PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
9
10S = "${WORKDIR}/git"
11
12BRANCH ?= "xlnx_rel_v2022.2"
13REPO ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https"
14SRCREV = "25b6fe7a26a975be15c002b48cfd4c291486491e"
15
16BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
17SRC_URI = "${REPO};${BRANCHARG}"
18
19inherit module
20
21EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
22COMPATIBLE_MACHINE = "^$"
23COMPATIBLE_MACHINE:zynqmp = "zynqmp"
24COMPATIBLE_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"
4LICENSE = "GPL-2.0-only" 4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe" 5LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe"
6 6
7XLNX_HDMI_VERSION = "5.15.19" 7XLNX_HDMI_VERSION = "6.1"
8PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}" 8PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
9 9
10S = "${WORKDIR}/git" 10S = "${WORKDIR}/git"
11 11
12BRANCH ?= "master" 12BRANCH ?= "master"
13REPO ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https" 13REPO ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https"
14SRCREV = "320153961a4b67795f8252ac8964f8c7919a39ca" 14SRCREV = "1c6330f02fea68992e22400fdbc8c0d0e63e2958"
15 15
16BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" 16BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
17SRC_URI = "${REPO};${BRANCHARG}" 17SRC_URI = "${REPO};${BRANCHARG}"