summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@amd.com>2024-05-16 19:32:09 -0600
committerMark Hatle <mark.hatle@amd.com>2024-05-18 13:08:08 -0600
commit364fb5d64cfd7a0c16cf52a1047e43981c831fc6 (patch)
treed388d5fd9055b98d8fe292feecbaca9cd41954e3
parent6c39a3b3e4b1e8dc06317080126c65e559341da5 (diff)
downloadmeta-xilinx-364fb5d64cfd7a0c16cf52a1047e43981c831fc6.tar.gz
kernel-module-mali: Simplify versions
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 <mark.hatle@amd.com>
Diffstat
-rw-r--r--meta-xilinx-core/conf/layer.conf3
-rw-r--r--meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2022.2.bb60
-rw-r--r--meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2023.1.bb60
-rw-r--r--meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2023.2.bb60
-rw-r--r--meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_r9p0-01rel0.bb (renamed from meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2022.1.bb)7
5 files changed, 2 insertions, 188 deletions
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%"
70XILINX_LINUX_VERSION[v2023.2] = "6.1.60%" 70XILINX_LINUX_VERSION[v2023.2] = "6.1.60%"
71PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" 71PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
72 72
73# Mali needs to match the kernel version
74PREFERRED_VERSION_kernel-module-mali = "r9p0-01rel0-${XILINX_RELEASE_VERSION}"
75
76# DP kernel module 73# DP kernel module
77KERNEL_MODULE_DP_VERSION[v2022.1] = "5.10.0+xilinx-v2022.1+git%" 74KERNEL_MODULE_DP_VERSION[v2022.1] = "5.10.0+xilinx-v2022.1+git%"
78KERNEL_MODULE_DP_VERSION[v2022.2] = "5.10.0+xilinx-v2022.2+git%" 75KERNEL_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 @@
1SUMMARY = "A Mali 400 Linux Kernel module"
2SECTION = "kernel/modules"
3
4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = " \
6 file://linux/license/gpl/mali_kernel_license.h;md5=f5af2d61f4c1eb262cb6a557aaa1070a \
7 "
8
9MALI_VERSION = "r9p0-01rel0"
10PV =. "${MALI_VERSION}-v"
11
12SRC_URI = " \
13 https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu/DX910-SW-99002-${MALI_VERSION}.tgz \
14 file://0001-Change-Makefile-to-be-compatible-with-Yocto.patch \
15 file://0002-staging-mali-r8p0-01rel0-Add-the-ZYNQ-ZYNQMP-platfor.patch \
16 file://0003-staging-mali-r8p0-01rel0-Remove-unused-trace-macros.patch \
17 file://0004-staging-mali-r8p0-01rel0-Don-t-include-mali_read_phy.patch \
18 file://0005-linux-mali_kernel_linux.c-Handle-clock-when-probed-a.patch \
19 file://0006-arm.c-global-variable-dma_ops-is-removed-from-the-ke.patch \
20 file://0010-common-mali_pm.c-Add-PM-runtime-barrier-after-removi.patch \
21 file://0011-linux-mali_kernel_linux.c-Enable-disable-clock-for-r.patch\
22 file://0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch\
23 file://0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch\
24 file://0014-linux-mali_-timer-Get-rid-of-init_timer.patch\
25 file://0015-fix-driver-failed-to-check-map-error.patch \
26 file://0016-mali_memory_secure-Kernel-5.0-onwards-access_ok-API-.patch \
27 file://0017-Support-for-vm_insert_pfn-deprecated-from-kernel-4.2.patch \
28 file://0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch \
29 file://0019-get_monotonic_boottime-ts-deprecated-from-kernel-4.2.patch \
30 file://0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch \
31 file://0021-Use-updated-timekeeping-functions-in-kernel-5.6.patch \
32 file://0022-Set-HAVE_UNLOCKED_IOCTL-default-to-true.patch \
33 file://0023-Use-PTR_ERR_OR_ZERO-instead-of-PTR_RET.patch \
34 file://0024-Use-community-device-tree-names.patch \
35 file://0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch \
36 file://0026-Fix-gpu-driver-probe-failure.patch \
37 file://0027-Updated-clock-name-and-structure-to-match-LIMA-drive.patch \
38 file://0028-Replace-vma-vm_flags-direct-modifications-with-modif.patch \
39 file://0029-Fixed-buildpath-QA-warning.patch \
40 "
41SRC_URI[md5sum] = "85ea110dd6675c70b7d01af87ec9633c"
42SRC_URI[sha256sum] = "7a67127341d17640c1fff5dad80258fb2a37c8a2121b81525fe2327e4532ce2b"
43
44inherit features_check module
45
46PARALLEL_MAKE = "-j 1"
47
48S = "${WORKDIR}/DX910-SW-99002-${MALI_VERSION}/driver/src/devicedrv/mali"
49
50REQUIRED_MACHINE_FEATURES = "mali400"
51
52EXTRA_OEMAKE = 'KDIR="${STAGING_KERNEL_DIR}" \
53 ARCH="${ARCH}" \
54 BUILD=release \
55 MALI_PLATFORM="arm" \
56 USING_DT=1 \
57 MALI_SHARED_INTERRUPTS=1 \
58 CROSS_COMPILE="${TARGET_PREFIX}" \
59 MALI_QUIET=1 \
60 '
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 @@
1SUMMARY = "A Mali 400 Linux Kernel module"
2SECTION = "kernel/modules"
3
4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = " \
6 file://linux/license/gpl/mali_kernel_license.h;md5=f5af2d61f4c1eb262cb6a557aaa1070a \
7 "
8
9MALI_VERSION = "r9p0-01rel0"
10PV =. "${MALI_VERSION}-v"
11
12SRC_URI = " \
13 https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu/DX910-SW-99002-${MALI_VERSION}.tgz \
14 file://0001-Change-Makefile-to-be-compatible-with-Yocto.patch \
15 file://0002-staging-mali-r8p0-01rel0-Add-the-ZYNQ-ZYNQMP-platfor.patch \
16 file://0003-staging-mali-r8p0-01rel0-Remove-unused-trace-macros.patch \
17 file://0004-staging-mali-r8p0-01rel0-Don-t-include-mali_read_phy.patch \
18 file://0005-linux-mali_kernel_linux.c-Handle-clock-when-probed-a.patch \
19 file://0006-arm.c-global-variable-dma_ops-is-removed-from-the-ke.patch \
20 file://0010-common-mali_pm.c-Add-PM-runtime-barrier-after-removi.patch \
21 file://0011-linux-mali_kernel_linux.c-Enable-disable-clock-for-r.patch\
22 file://0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch\
23 file://0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch\
24 file://0014-linux-mali_-timer-Get-rid-of-init_timer.patch\
25 file://0015-fix-driver-failed-to-check-map-error.patch \
26 file://0016-mali_memory_secure-Kernel-5.0-onwards-access_ok-API-.patch \
27 file://0017-Support-for-vm_insert_pfn-deprecated-from-kernel-4.2.patch \
28 file://0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch \
29 file://0019-get_monotonic_boottime-ts-deprecated-from-kernel-4.2.patch \
30 file://0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch \
31 file://0021-Use-updated-timekeeping-functions-in-kernel-5.6.patch \
32 file://0022-Set-HAVE_UNLOCKED_IOCTL-default-to-true.patch \
33 file://0023-Use-PTR_ERR_OR_ZERO-instead-of-PTR_RET.patch \
34 file://0024-Use-community-device-tree-names.patch \
35 file://0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch \
36 file://0026-Fix-gpu-driver-probe-failure.patch \
37 file://0027-Updated-clock-name-and-structure-to-match-LIMA-drive.patch \
38 file://0028-Replace-vma-vm_flags-direct-modifications-with-modif.patch \
39 file://0029-Fixed-buildpath-QA-warning.patch \
40 "
41SRC_URI[md5sum] = "85ea110dd6675c70b7d01af87ec9633c"
42SRC_URI[sha256sum] = "7a67127341d17640c1fff5dad80258fb2a37c8a2121b81525fe2327e4532ce2b"
43
44inherit features_check module
45
46PARALLEL_MAKE = "-j 1"
47
48S = "${WORKDIR}/DX910-SW-99002-${MALI_VERSION}/driver/src/devicedrv/mali"
49
50REQUIRED_MACHINE_FEATURES = "mali400"
51
52EXTRA_OEMAKE = 'KDIR="${STAGING_KERNEL_DIR}" \
53 ARCH="${ARCH}" \
54 BUILD=release \
55 MALI_PLATFORM="arm" \
56 USING_DT=1 \
57 MALI_SHARED_INTERRUPTS=1 \
58 CROSS_COMPILE="${TARGET_PREFIX}" \
59 MALI_QUIET=1 \
60 '
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 @@
1SUMMARY = "A Mali 400 Linux Kernel module"
2SECTION = "kernel/modules"
3
4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = " \
6 file://linux/license/gpl/mali_kernel_license.h;md5=f5af2d61f4c1eb262cb6a557aaa1070a \
7 "
8
9MALI_VERSION = "r9p0-01rel0"
10PV =. "${MALI_VERSION}-v"
11
12SRC_URI = " \
13 https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu/DX910-SW-99002-${MALI_VERSION}.tgz \
14 file://0001-Change-Makefile-to-be-compatible-with-Yocto.patch \
15 file://0002-staging-mali-r8p0-01rel0-Add-the-ZYNQ-ZYNQMP-platfor.patch \
16 file://0003-staging-mali-r8p0-01rel0-Remove-unused-trace-macros.patch \
17 file://0004-staging-mali-r8p0-01rel0-Don-t-include-mali_read_phy.patch \
18 file://0005-linux-mali_kernel_linux.c-Handle-clock-when-probed-a.patch \
19 file://0006-arm.c-global-variable-dma_ops-is-removed-from-the-ke.patch \
20 file://0010-common-mali_pm.c-Add-PM-runtime-barrier-after-removi.patch \
21 file://0011-linux-mali_kernel_linux.c-Enable-disable-clock-for-r.patch\
22 file://0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch\
23 file://0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch\
24 file://0014-linux-mali_-timer-Get-rid-of-init_timer.patch\
25 file://0015-fix-driver-failed-to-check-map-error.patch \
26 file://0016-mali_memory_secure-Kernel-5.0-onwards-access_ok-API-.patch \
27 file://0017-Support-for-vm_insert_pfn-deprecated-from-kernel-4.2.patch \
28 file://0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch \
29 file://0019-get_monotonic_boottime-ts-deprecated-from-kernel-4.2.patch \
30 file://0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch \
31 file://0021-Use-updated-timekeeping-functions-in-kernel-5.6.patch \
32 file://0022-Set-HAVE_UNLOCKED_IOCTL-default-to-true.patch \
33 file://0023-Use-PTR_ERR_OR_ZERO-instead-of-PTR_RET.patch \
34 file://0024-Use-community-device-tree-names.patch \
35 file://0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch \
36 file://0026-Fix-gpu-driver-probe-failure.patch \
37 file://0027-Updated-clock-name-and-structure-to-match-LIMA-drive.patch \
38 file://0028-Replace-vma-vm_flags-direct-modifications-with-modif.patch \
39 file://0029-Fixed-buildpath-QA-warning.patch \
40 "
41SRC_URI[md5sum] = "85ea110dd6675c70b7d01af87ec9633c"
42SRC_URI[sha256sum] = "7a67127341d17640c1fff5dad80258fb2a37c8a2121b81525fe2327e4532ce2b"
43
44inherit features_check module
45
46PARALLEL_MAKE = "-j 1"
47
48S = "${WORKDIR}/DX910-SW-99002-${MALI_VERSION}/driver/src/devicedrv/mali"
49
50REQUIRED_MACHINE_FEATURES = "mali400"
51
52EXTRA_OEMAKE = 'KDIR="${STAGING_KERNEL_DIR}" \
53 ARCH="${ARCH}" \
54 BUILD=release \
55 MALI_PLATFORM="arm" \
56 USING_DT=1 \
57 MALI_SHARED_INTERRUPTS=1 \
58 CROSS_COMPILE="${TARGET_PREFIX}" \
59 MALI_QUIET=1 \
60 '
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
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 = " \
6 file://linux/license/gpl/mali_kernel_license.h;md5=f5af2d61f4c1eb262cb6a557aaa1070a \ 6 file://linux/license/gpl/mali_kernel_license.h;md5=f5af2d61f4c1eb262cb6a557aaa1070a \
7 " 7 "
8 8
9MALI_VERSION = "r9p0-01rel0"
10PV =. "${MALI_VERSION}-v"
11
12SRC_URI = " \ 9SRC_URI = " \
13 https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu/DX910-SW-99002-${MALI_VERSION}.tgz \ 10 https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu/DX910-SW-99002-${PV}.tgz \
14 file://0001-Change-Makefile-to-be-compatible-with-Yocto.patch \ 11 file://0001-Change-Makefile-to-be-compatible-with-Yocto.patch \
15 file://0002-staging-mali-r8p0-01rel0-Add-the-ZYNQ-ZYNQMP-platfor.patch \ 12 file://0002-staging-mali-r8p0-01rel0-Add-the-ZYNQ-ZYNQMP-platfor.patch \
16 file://0003-staging-mali-r8p0-01rel0-Remove-unused-trace-macros.patch \ 13 file://0003-staging-mali-r8p0-01rel0-Remove-unused-trace-macros.patch \
@@ -45,7 +42,7 @@ inherit features_check module
45 42
46PARALLEL_MAKE = "-j 1" 43PARALLEL_MAKE = "-j 1"
47 44
48S = "${WORKDIR}/DX910-SW-99002-${MALI_VERSION}/driver/src/devicedrv/mali" 45S = "${WORKDIR}/DX910-SW-99002-${PV}/driver/src/devicedrv/mali"
49 46
50REQUIRED_MACHINE_FEATURES = "mali400" 47REQUIRED_MACHINE_FEATURES = "mali400"
51 48
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-07-30 21:31:14 +0000