From: Mark Hatle <[email protected]> There is no need for multiple versions, the latest version will 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 ------ .../dp/kernel-module-dp_2022.1.bb | 24 ------------------- .../dp/kernel-module-dp_2022.2.bb | 24 ------------------- ...p_2023.1.bb => kernel-module-dp_6.1.60.bb} | 5 ++-- 4 files changed, 2 insertions(+), 58 deletions(-) delete mode 100755 meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2022.1.bb delete mode 100644 meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2022.2.bb rename meta-xilinx-core/recipes-kernel/dp/{kernel-module-dp_2023.1.bb => kernel-module-dp_6.1.60.bb} (81%) diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index e111c22b..14deb44d 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'}" -# DP kernel module -KERNEL_MODULE_DP_VERSION[v2022.1] = "5.10.0+xilinx-v2022.1+git%" -KERNEL_MODULE_DP_VERSION[v2022.2] = "5.10.0+xilinx-v2022.2+git%" -KERNEL_MODULE_DP_VERSION[v2023.1] = "6.1.0+xilinx-v2023.1+git%" -KERNEL_MODULE_DP_VERSION[v2023.2] = "6.1.0+xilinx-v2023.2+git%" -PREFERRED_VERSION_kernel-module-dp ?= "${@d.getVarFlag('KERNEL_MODULE_DP_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%" diff --git a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2022.1.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2022.1.bb deleted file mode 100755 index 1e6c867b..00000000 --- a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2022.1.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Xilinx DisplayPort Linux Kernel module" -DESCRIPTION = "Out-of-tree DisplayPort(DP) kernel modules provider for aarch64 devices" -SECTION = "kernel/modules" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a" - -XLNX_DP_VERSION = "5.10.0" -PV = "${XLNX_DP_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/dp-modules.git;protocol=https" -SRCREV ?= "9a025fdb7134a8af12de8d69f5a428c8284ae9b3" - -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/dp/kernel-module-dp_2022.2.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2022.2.bb deleted file mode 100644 index 3a705fe9..00000000 --- a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2022.2.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Xilinx DisplayPort Linux Kernel module" -DESCRIPTION = "Out-of-tree DisplayPort(DP) kernel modules provider for aarch64 devices" -SECTION = "kernel/modules" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a" - -XLNX_DP_VERSION = "5.10.0" -PV = "${XLNX_DP_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/dp-modules.git;protocol=https" -SRCREV ?= "c57b2ce95ee6c86f35caecbc7007644ff8f6d337" - -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/dp/kernel-module-dp_2023.1.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_6.1.60.bb similarity index 81% rename from meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2023.1.bb rename to meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_6.1.60.bb index 77cb59a5..ac49cf95 100644 --- a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_2023.1.bb +++ b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_6.1.60.bb @@ -4,12 +4,11 @@ SECTION = "kernel/modules" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a" -XLNX_DP_VERSION = "6.1.0" -PV = "${XLNX_DP_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git" +PV .= "+git" S = "${WORKDIR}/git" -BRANCH ?= "xlnx_rel_v2023.1" +BRANCH ?= "xlnx_rel_v2023.2" REPO ?= "git://github.com/xilinx/dp-modules.git;protocol=https" SRCREV ?= "5b0969ac09f301c33bccc140c8f60e832f5cf222" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#5332): https://lists.yoctoproject.org/g/meta-xilinx/message/5332 Mute This Topic: https://lists.yoctoproject.org/mt/106179149/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-xilinx/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
