From d0979730c2ac7951f97ffb02c07ad1ad3e117b32 Mon Sep 17 00:00:00 2001 From: Manjukumar Matha Date: Fri, 26 May 2017 15:00:33 -0700 Subject: 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 Reviewed-by: Nathan Rossi --- conf/machine/include/machine-xilinx-default.inc | 4 ---- conf/machine/zcu102-zynqmp.conf | 2 +- 2 files changed, 1 insertion(+), 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}" UBOOT_ELF ?= "u-boot" UBOOT_ELF_aarch64 ?= "u-boot.elf" -# kernel modules for ZynqMP -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append_zynqmp = " \ - ${@bb.utils.contains('MACHINE_FEATURES', 'mali', bb.utils.contains('PREFERRED_PROVIDER_virtual/kernel', 'linux-xlnx', 'kernel-module-mali', '', d), '', d)} \ - " XSERVER ?= " \ xserver-xorg \ 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 require conf/machine/include/machine-xilinx-board.inc require conf/machine/include/machine-xilinx-qemu.inc -MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost mali" +MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" UBOOT_MACHINE = "xilinx_zynqmp_zcu102_revB_defconfig" -- cgit v1.2.3-54-g00ecf