From: Mark Hatle <[email protected]> There is no need for multiple versions, the latest version should work with all of the kernels we care about. Version has been adjusted to 6.1.60 to indicate the latest kernel it was actively tested with.
Signed-off-by: Mark Hatle <[email protected]> --- meta-xilinx-core/conf/layer.conf | 7 ------ .../hdmi/kernel-module-hdmi_2022.1.bb | 24 ------------------- .../hdmi/kernel-module-hdmi_2022.2.bb | 24 ------------------- .../hdmi/kernel-module-hdmi_2023.1.bb | 24 ------------------- ...2023.2.bb => kernel-module-hdmi_6.1.60.bb} | 3 +-- 5 files changed, 1 insertion(+), 81 deletions(-) delete mode 100644 meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.1.bb delete mode 100644 meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.2.bb delete mode 100644 meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.1.bb rename meta-xilinx-core/recipes-kernel/hdmi/{kernel-module-hdmi_2023.2.bb => kernel-module-hdmi_6.1.60.bb} (84%) diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 14deb44d..a8347722 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -70,13 +70,6 @@ XILINX_LINUX_VERSION[v2023.1] = "6.1.30%" XILINX_LINUX_VERSION[v2023.2] = "6.1.60%" PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" -# HDMI kernel module -KERNEL_MODULE_HDMI_VERSION[v2022.1] = "5.15.0+xilinx-v2022.1+git%" -KERNEL_MODULE_HDMI_VERSION[v2022.2] = "5.15.19+xilinx-v2022.2+git%" -KERNEL_MODULE_HDMI_VERSION[v2023.1] = "6.1+xilinx-v2023.1+git%" -KERNEL_MODULE_HDMI_VERSION[v2023.2] = "6.1+xilinx-v2023.2+git%" -PREFERRED_VERSION_kernel-module-hdmi ?= "${@d.getVarFlag('KERNEL_MODULE_HDMI_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" - # VCU kernel module PREFERRED_VERSION_kernel-module-vcu = "1.0.0-xilinx-${XILINX_RELEASE_VERSION}+git%" diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.1.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.1.bb deleted file mode 100644 index e34bbd1b..00000000 --- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.1.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.0" -PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git" - -S = "${WORKDIR}/git" - -BRANCH ?= "xlnx_rel_v2022.1" -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_2022.2.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.2.bb deleted file mode 100644 index 832d3ce0..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" - -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 deleted file mode 100644 index b426caca..00000000 --- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.1.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 = "6.1" -PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git" - -S = "${WORKDIR}/git" - -BRANCH ?= "xlnx_rel_v2023.1" -REPO ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https" -SRCREV = "1c6330f02fea68992e22400fdbc8c0d0e63e2958" - -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.2.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.1.60.bb similarity index 84% rename from meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.2.bb rename to meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.1.60.bb index 9f884392..c9f20e30 100644 --- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.2.bb +++ b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.1.60.bb @@ -4,8 +4,7 @@ SECTION = "kernel/modules" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe" -XLNX_HDMI_VERSION = "6.1" -PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git" +PV .= "+git" S = "${WORKDIR}/git" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#5334): https://lists.yoctoproject.org/g/meta-xilinx/message/5334 Mute This Topic: https://lists.yoctoproject.org/mt/106179151/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-xilinx/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
