From dcc81c0c5ffeab19ea02929a65a60398fcf46978 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 24 Oct 2022 18:15:59 -0700 Subject: 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 --- meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc | 5 +++++ .../linux/linux-xlnx/linux-xlnx-kmeta/features/drm-lima/drm-lima.cfg | 3 +++ .../linux/linux-xlnx/linux-xlnx-kmeta/features/drm-lima/drm-lima.scc | 3 +++ 3 files changed, 11 insertions(+) create mode 100644 meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/drm-lima/drm-lima.cfg create mode 100644 meta-xilinx-core/recipes-kernel/linux/linux-xlnx/linux-xlnx-kmeta/features/drm-lima/drm-lima.scc diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc index 2fb2bf30..618eefc2 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) KERNELURI ?= "git://github.com/Xilinx/linux-xlnx.git;protocol=https;name=machine" YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=yocto-kmeta" SRC_URI = "${KERNELURI};${SRCBRANCHARG} ${YOCTO_META}" +SRC_URI += "file://linux-xlnx-kmeta;type=kmeta;name=linux-xlnx-kmeta;destsuffix=linux-xlnx-kmeta" SRCREV_machine ?= "${SRCREV}" SRCREV_meta ?= "eeb5d0c9dd5e2928835c633644426ee357fbce12" @@ -60,3 +61,7 @@ KERNEL_FEATURES:append:zynqmp = "${@' features/xilinx/overlay_of/overlay_of.scc' KERNEL_FEATURES:append:versal = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)} features/xilinx/hdmi-module/hdmi-module.scc" KERNEL_FEATURES:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', ' features/ocicontainer/ocicontainer.scc', '', d)}" + +# Enable DRM_LIMA support if mali400 is not enabled +KERNEL_FEATURES:append:zynqmp-eg = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', '', ' features/drm-lima/drm-lima.scc', d)}" +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 @@ +# SPDX-License-Identifier: MIT +CONFIG_DRM=y +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 @@ +# SPDX-License-Identifier: MIT +kconf hardware drm-lima.cfg + -- cgit v1.2.3-54-g00ecf