diff options
| author | Mark Hatle <mark.hatle@amd.com> | 2022-10-24 18:15:59 -0700 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@amd.com> | 2022-10-25 07:28:58 -0700 |
| commit | 28882a059630ae7bf4da5e01e25435190d27fcf8 (patch) | |
| tree | 93deb9697755fb089e1a6747f898276cf277cf08 | |
| parent | c873c17657b2ae93bac9e3d116b0457c8631273e (diff) | |
| download | meta-xilinx-28882a059630ae7bf4da5e01e25435190d27fcf8.tar.gz | |
linux-xlnx: Add local kmeta with drm-lima support
drm-lima will be enabled if mali400 is NOT enabled, via MACHINE_FEATURES on
the zynqmp-eg and zynqmp-ev.
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
3 files changed, 11 insertions, 0 deletions
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc index dc79151a..796dfcb8 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc | |||
| @@ -10,6 +10,7 @@ FILESOVERRIDES:append := ":${@bb.parse.vars_from_file(d.getVar('FILE', False),d) | |||
| 10 | KERNELURI ?= "git://github.com/Xilinx/linux-xlnx.git;protocol=https;name=machine" | 10 | KERNELURI ?= "git://github.com/Xilinx/linux-xlnx.git;protocol=https;name=machine" |
| 11 | YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=yocto-kmeta" | 11 | YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=yocto-kmeta" |
| 12 | SRC_URI = "${KERNELURI};${SRCBRANCHARG} ${YOCTO_META}" | 12 | SRC_URI = "${KERNELURI};${SRCBRANCHARG} ${YOCTO_META}" |
| 13 | SRC_URI += "file://linux-xlnx-kmeta;type=kmeta;name=linux-xlnx-kmeta;destsuffix=linux-xlnx-kmeta" | ||
| 13 | 14 | ||
| 14 | SRCREV_machine ?= "${SRCREV}" | 15 | SRCREV_machine ?= "${SRCREV}" |
| 15 | SRCREV_meta ?= "eeb5d0c9dd5e2928835c633644426ee357fbce12" | 16 | SRCREV_meta ?= "eeb5d0c9dd5e2928835c633644426ee357fbce12" |
| @@ -60,3 +61,7 @@ KERNEL_FEATURES:append:zynqmp = "${@' features/xilinx/overlay_of/overlay_of.scc' | |||
| 60 | KERNEL_FEATURES:append:versal = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)} features/xilinx/hdmi-module/hdmi-module.scc" | 61 | KERNEL_FEATURES:append:versal = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)} features/xilinx/hdmi-module/hdmi-module.scc" |
| 61 | 62 | ||
| 62 | KERNEL_FEATURES:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', ' features/ocicontainer/ocicontainer.scc', '', d)}" | 63 | KERNEL_FEATURES:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', ' features/ocicontainer/ocicontainer.scc', '', d)}" |
| 64 | |||
| 65 | # Enable DRM_LIMA support if mali400 is not enabled | ||
| 66 | KERNEL_FEATURES:append:zynqmp-eg = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', '', ' features/drm-lima/drm-lima.scc', d)}" | ||
| 67 | KERNEL_FEATURES:append:zynqmp-ev = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', '', ' features/drm-lima/drm-lima.scc', d)}" | ||
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/drm-lima/drm-lima.cfg b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/drm-lima/drm-lima.cfg new file mode 100644 index 00000000..8377614c --- /dev/null +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/drm-lima/drm-lima.cfg | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | # SPDX-License-Identifier: MIT | ||
| 2 | CONFIG_DRM=y | ||
| 3 | CONFIG_DRM_LIMA=m | ||
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/drm-lima/drm-lima.scc b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/drm-lima/drm-lima.scc new file mode 100644 index 00000000..425cc233 --- /dev/null +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/drm-lima/drm-lima.scc | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | # SPDX-License-Identifier: MIT | ||
| 2 | kconf hardware drm-lima.cfg | ||
| 3 | |||