From: Mark Hatle <[email protected]> Remove the special MALI_VERSION, and set the PV to the proper matching version.
With code inspection, there is no purpose to the multiple versions, as the module will work with different kernel versions. Remove unnecessary recipes. Signed-off-by: Mark Hatle <[email protected]> --- meta-xilinx-core/conf/layer.conf | 3 - .../mali/kernel-module-mali_2022.2.bb | 60 ------------------- .../mali/kernel-module-mali_2023.1.bb | 60 ------------------- .../mali/kernel-module-mali_2023.2.bb | 60 ------------------- ...1.bb => kernel-module-mali_r9p0-01rel0.bb} | 7 +-- 5 files changed, 2 insertions(+), 188 deletions(-) delete mode 100644 meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2022.2.bb delete mode 100644 meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2023.1.bb delete mode 100644 meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2023.2.bb rename meta-xilinx-core/recipes-graphics/mali/{kernel-module-mali_2022.1.bb => kernel-module-mali_r9p0-01rel0.bb} (92%) diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 4457b5f9..e111c22b 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf @@ -70,9 +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'}" -# Mali needs to match the kernel version -PREFERRED_VERSION_kernel-module-mali = "r9p0-01rel0-${XILINX_RELEASE_VERSION}" - # 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%" diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2022.2.bb b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2022.2.bb deleted file mode 100644 index 72bd7759..00000000 --- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2022.2.bb +++ /dev/null @@ -1,60 +0,0 @@ -SUMMARY = "A Mali 400 Linux Kernel module" -SECTION = "kernel/modules" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = " \ - file://linux/license/gpl/mali_kernel_license.h;md5=f5af2d61f4c1eb262cb6a557aaa1070a \ - " - -MALI_VERSION = "r9p0-01rel0" -PV =. "${MALI_VERSION}-v" - -SRC_URI = " \ - https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu/DX910-SW-99002-${MALI_VERSION}.tgz \ - file://0001-Change-Makefile-to-be-compatible-with-Yocto.patch \ - file://0002-staging-mali-r8p0-01rel0-Add-the-ZYNQ-ZYNQMP-platfor.patch \ - file://0003-staging-mali-r8p0-01rel0-Remove-unused-trace-macros.patch \ - file://0004-staging-mali-r8p0-01rel0-Don-t-include-mali_read_phy.patch \ - file://0005-linux-mali_kernel_linux.c-Handle-clock-when-probed-a.patch \ - file://0006-arm.c-global-variable-dma_ops-is-removed-from-the-ke.patch \ - file://0010-common-mali_pm.c-Add-PM-runtime-barrier-after-removi.patch \ - file://0011-linux-mali_kernel_linux.c-Enable-disable-clock-for-r.patch\ - file://0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch\ - file://0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch\ - file://0014-linux-mali_-timer-Get-rid-of-init_timer.patch\ - file://0015-fix-driver-failed-to-check-map-error.patch \ - file://0016-mali_memory_secure-Kernel-5.0-onwards-access_ok-API-.patch \ - file://0017-Support-for-vm_insert_pfn-deprecated-from-kernel-4.2.patch \ - file://0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch \ - file://0019-get_monotonic_boottime-ts-deprecated-from-kernel-4.2.patch \ - file://0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch \ - file://0021-Use-updated-timekeeping-functions-in-kernel-5.6.patch \ - file://0022-Set-HAVE_UNLOCKED_IOCTL-default-to-true.patch \ - file://0023-Use-PTR_ERR_OR_ZERO-instead-of-PTR_RET.patch \ - file://0024-Use-community-device-tree-names.patch \ - file://0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch \ - file://0026-Fix-gpu-driver-probe-failure.patch \ - file://0027-Updated-clock-name-and-structure-to-match-LIMA-drive.patch \ - file://0028-Replace-vma-vm_flags-direct-modifications-with-modif.patch \ - file://0029-Fixed-buildpath-QA-warning.patch \ - " -SRC_URI[md5sum] = "85ea110dd6675c70b7d01af87ec9633c" -SRC_URI[sha256sum] = "7a67127341d17640c1fff5dad80258fb2a37c8a2121b81525fe2327e4532ce2b" - -inherit features_check module - -PARALLEL_MAKE = "-j 1" - -S = "${WORKDIR}/DX910-SW-99002-${MALI_VERSION}/driver/src/devicedrv/mali" - -REQUIRED_MACHINE_FEATURES = "mali400" - -EXTRA_OEMAKE = 'KDIR="${STAGING_KERNEL_DIR}" \ - ARCH="${ARCH}" \ - BUILD=release \ - MALI_PLATFORM="arm" \ - USING_DT=1 \ - MALI_SHARED_INTERRUPTS=1 \ - CROSS_COMPILE="${TARGET_PREFIX}" \ - MALI_QUIET=1 \ - ' diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2023.1.bb b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2023.1.bb deleted file mode 100644 index 72bd7759..00000000 --- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2023.1.bb +++ /dev/null @@ -1,60 +0,0 @@ -SUMMARY = "A Mali 400 Linux Kernel module" -SECTION = "kernel/modules" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = " \ - file://linux/license/gpl/mali_kernel_license.h;md5=f5af2d61f4c1eb262cb6a557aaa1070a \ - " - -MALI_VERSION = "r9p0-01rel0" -PV =. "${MALI_VERSION}-v" - -SRC_URI = " \ - https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu/DX910-SW-99002-${MALI_VERSION}.tgz \ - file://0001-Change-Makefile-to-be-compatible-with-Yocto.patch \ - file://0002-staging-mali-r8p0-01rel0-Add-the-ZYNQ-ZYNQMP-platfor.patch \ - file://0003-staging-mali-r8p0-01rel0-Remove-unused-trace-macros.patch \ - file://0004-staging-mali-r8p0-01rel0-Don-t-include-mali_read_phy.patch \ - file://0005-linux-mali_kernel_linux.c-Handle-clock-when-probed-a.patch \ - file://0006-arm.c-global-variable-dma_ops-is-removed-from-the-ke.patch \ - file://0010-common-mali_pm.c-Add-PM-runtime-barrier-after-removi.patch \ - file://0011-linux-mali_kernel_linux.c-Enable-disable-clock-for-r.patch\ - file://0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch\ - file://0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch\ - file://0014-linux-mali_-timer-Get-rid-of-init_timer.patch\ - file://0015-fix-driver-failed-to-check-map-error.patch \ - file://0016-mali_memory_secure-Kernel-5.0-onwards-access_ok-API-.patch \ - file://0017-Support-for-vm_insert_pfn-deprecated-from-kernel-4.2.patch \ - file://0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch \ - file://0019-get_monotonic_boottime-ts-deprecated-from-kernel-4.2.patch \ - file://0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch \ - file://0021-Use-updated-timekeeping-functions-in-kernel-5.6.patch \ - file://0022-Set-HAVE_UNLOCKED_IOCTL-default-to-true.patch \ - file://0023-Use-PTR_ERR_OR_ZERO-instead-of-PTR_RET.patch \ - file://0024-Use-community-device-tree-names.patch \ - file://0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch \ - file://0026-Fix-gpu-driver-probe-failure.patch \ - file://0027-Updated-clock-name-and-structure-to-match-LIMA-drive.patch \ - file://0028-Replace-vma-vm_flags-direct-modifications-with-modif.patch \ - file://0029-Fixed-buildpath-QA-warning.patch \ - " -SRC_URI[md5sum] = "85ea110dd6675c70b7d01af87ec9633c" -SRC_URI[sha256sum] = "7a67127341d17640c1fff5dad80258fb2a37c8a2121b81525fe2327e4532ce2b" - -inherit features_check module - -PARALLEL_MAKE = "-j 1" - -S = "${WORKDIR}/DX910-SW-99002-${MALI_VERSION}/driver/src/devicedrv/mali" - -REQUIRED_MACHINE_FEATURES = "mali400" - -EXTRA_OEMAKE = 'KDIR="${STAGING_KERNEL_DIR}" \ - ARCH="${ARCH}" \ - BUILD=release \ - MALI_PLATFORM="arm" \ - USING_DT=1 \ - MALI_SHARED_INTERRUPTS=1 \ - CROSS_COMPILE="${TARGET_PREFIX}" \ - MALI_QUIET=1 \ - ' diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2023.2.bb b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2023.2.bb deleted file mode 100644 index 72bd7759..00000000 --- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2023.2.bb +++ /dev/null @@ -1,60 +0,0 @@ -SUMMARY = "A Mali 400 Linux Kernel module" -SECTION = "kernel/modules" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = " \ - file://linux/license/gpl/mali_kernel_license.h;md5=f5af2d61f4c1eb262cb6a557aaa1070a \ - " - -MALI_VERSION = "r9p0-01rel0" -PV =. "${MALI_VERSION}-v" - -SRC_URI = " \ - https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu/DX910-SW-99002-${MALI_VERSION}.tgz \ - file://0001-Change-Makefile-to-be-compatible-with-Yocto.patch \ - file://0002-staging-mali-r8p0-01rel0-Add-the-ZYNQ-ZYNQMP-platfor.patch \ - file://0003-staging-mali-r8p0-01rel0-Remove-unused-trace-macros.patch \ - file://0004-staging-mali-r8p0-01rel0-Don-t-include-mali_read_phy.patch \ - file://0005-linux-mali_kernel_linux.c-Handle-clock-when-probed-a.patch \ - file://0006-arm.c-global-variable-dma_ops-is-removed-from-the-ke.patch \ - file://0010-common-mali_pm.c-Add-PM-runtime-barrier-after-removi.patch \ - file://0011-linux-mali_kernel_linux.c-Enable-disable-clock-for-r.patch\ - file://0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch\ - file://0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch\ - file://0014-linux-mali_-timer-Get-rid-of-init_timer.patch\ - file://0015-fix-driver-failed-to-check-map-error.patch \ - file://0016-mali_memory_secure-Kernel-5.0-onwards-access_ok-API-.patch \ - file://0017-Support-for-vm_insert_pfn-deprecated-from-kernel-4.2.patch \ - file://0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch \ - file://0019-get_monotonic_boottime-ts-deprecated-from-kernel-4.2.patch \ - file://0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch \ - file://0021-Use-updated-timekeeping-functions-in-kernel-5.6.patch \ - file://0022-Set-HAVE_UNLOCKED_IOCTL-default-to-true.patch \ - file://0023-Use-PTR_ERR_OR_ZERO-instead-of-PTR_RET.patch \ - file://0024-Use-community-device-tree-names.patch \ - file://0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch \ - file://0026-Fix-gpu-driver-probe-failure.patch \ - file://0027-Updated-clock-name-and-structure-to-match-LIMA-drive.patch \ - file://0028-Replace-vma-vm_flags-direct-modifications-with-modif.patch \ - file://0029-Fixed-buildpath-QA-warning.patch \ - " -SRC_URI[md5sum] = "85ea110dd6675c70b7d01af87ec9633c" -SRC_URI[sha256sum] = "7a67127341d17640c1fff5dad80258fb2a37c8a2121b81525fe2327e4532ce2b" - -inherit features_check module - -PARALLEL_MAKE = "-j 1" - -S = "${WORKDIR}/DX910-SW-99002-${MALI_VERSION}/driver/src/devicedrv/mali" - -REQUIRED_MACHINE_FEATURES = "mali400" - -EXTRA_OEMAKE = 'KDIR="${STAGING_KERNEL_DIR}" \ - ARCH="${ARCH}" \ - BUILD=release \ - MALI_PLATFORM="arm" \ - USING_DT=1 \ - MALI_SHARED_INTERRUPTS=1 \ - CROSS_COMPILE="${TARGET_PREFIX}" \ - MALI_QUIET=1 \ - ' diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2022.1.bb b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_r9p0-01rel0.bb similarity index 92% rename from meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2022.1.bb rename to meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_r9p0-01rel0.bb index 72bd7759..c25970e7 100644 --- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2022.1.bb +++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_r9p0-01rel0.bb @@ -6,11 +6,8 @@ LIC_FILES_CHKSUM = " \ file://linux/license/gpl/mali_kernel_license.h;md5=f5af2d61f4c1eb262cb6a557aaa1070a \ " -MALI_VERSION = "r9p0-01rel0" -PV =. "${MALI_VERSION}-v" - SRC_URI = " \ - https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu/DX910-SW-99002-${MALI_VERSION}.tgz \ + https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu/DX910-SW-99002-${PV}.tgz \ file://0001-Change-Makefile-to-be-compatible-with-Yocto.patch \ file://0002-staging-mali-r8p0-01rel0-Add-the-ZYNQ-ZYNQMP-platfor.patch \ file://0003-staging-mali-r8p0-01rel0-Remove-unused-trace-macros.patch \ @@ -45,7 +42,7 @@ inherit features_check module PARALLEL_MAKE = "-j 1" -S = "${WORKDIR}/DX910-SW-99002-${MALI_VERSION}/driver/src/devicedrv/mali" +S = "${WORKDIR}/DX910-SW-99002-${PV}/driver/src/devicedrv/mali" REQUIRED_MACHINE_FEATURES = "mali400" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#5330): https://lists.yoctoproject.org/g/meta-xilinx/message/5330 Mute This Topic: https://lists.yoctoproject.org/mt/106179147/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-xilinx/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
