summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorManjukumar Matha <manjukumar.harthikote-matha@xilinx.com>2017-05-26 15:00:33 -0700
committerNathan Rossi <nathan@nathanrossi.com>2017-05-30 19:30:28 +1000
commitd0979730c2ac7951f97ffb02c07ad1ad3e117b32 (patch)
treea3496ba55c56815943f88c5bf7f2afd79fc25384 /conf
parentea3543fe98b79acb451efb8af42dfe0ddff64d63 (diff)
downloadmeta-xilinx-d0979730c2ac7951f97ffb02c07ad1ad3e117b32.tar.gz
zcu102-zynqmp.conf: Remove mali as machine feature
Remove mali as machine feature. This is not required, any dependencies on mali userspace libraries should be resolved through gles1/gles2/egl preffered provider. for ex: PREFERRED_PROVIDER_virtual/libgles1_zynqmp = "libmali-xlnx" PREFERRED_PROVIDER_virtual/libgles2_zynqmp = "libmali-xlnx" PREFERRED_PROVIDER_virtual/egl_zynqmp = "libmali-xlnx" MALI userspace libraries inturn should depends on out-of-tree mali kernel module. Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> Reviewed-by: Nathan Rossi <nathan@nathanrossi.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/include/machine-xilinx-default.inc4
-rw-r--r--conf/machine/zcu102-zynqmp.conf2
2 files changed, 1 insertions, 5 deletions
diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc
index db10c484..2957e992 100644
--- a/conf/machine/include/machine-xilinx-default.inc
+++ b/conf/machine/include/machine-xilinx-default.inc
@@ -28,10 +28,6 @@ UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
28UBOOT_ELF ?= "u-boot" 28UBOOT_ELF ?= "u-boot"
29UBOOT_ELF_aarch64 ?= "u-boot.elf" 29UBOOT_ELF_aarch64 ?= "u-boot.elf"
30 30
31# kernel modules for ZynqMP
32MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append_zynqmp = " \
33 ${@bb.utils.contains('MACHINE_FEATURES', 'mali', bb.utils.contains('PREFERRED_PROVIDER_virtual/kernel', 'linux-xlnx', 'kernel-module-mali', '', d), '', d)} \
34 "
35XSERVER ?= " \ 31XSERVER ?= " \
36 xserver-xorg \ 32 xserver-xorg \
37 xf86-input-evdev \ 33 xf86-input-evdev \
diff --git a/conf/machine/zcu102-zynqmp.conf b/conf/machine/zcu102-zynqmp.conf
index 679a2e9c..463aef1a 100644
--- a/conf/machine/zcu102-zynqmp.conf
+++ b/conf/machine/zcu102-zynqmp.conf
@@ -7,7 +7,7 @@ require conf/machine/include/machine-xilinx-default.inc
7require conf/machine/include/machine-xilinx-board.inc 7require conf/machine/include/machine-xilinx-board.inc
8require conf/machine/include/machine-xilinx-qemu.inc 8require conf/machine/include/machine-xilinx-qemu.inc
9 9
10MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost mali" 10MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
11 11
12UBOOT_MACHINE = "xilinx_zynqmp_zcu102_revB_defconfig" 12UBOOT_MACHINE = "xilinx_zynqmp_zcu102_revB_defconfig"
13 13