[meta-xilinx] [PATCH] zynqmp: Make the MALI recommendation machine-specific

Mike Looijmans mike.looijmans at topic.nl
Tue Jul 26 03:59:48 PDT 2016


Not all zynqmp SoCs have a MALI GPU built in. Thus recommending
kernel-module-mali for all zynqmp machines is incorrect. Move
the recommendation to the board config.

This also makes for a nicer syntax, having less-specific platform
overrides for machine-specific variables just doesn't look right.

Signed-off-by: Mike Looijmans <mike.looijmans at topic.nl>
---
 conf/machine/include/machine-xilinx-default.inc | 4 ----
 conf/machine/zcu102-zynqmp.conf                 | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc
index 04f8558..012e00e 100644
--- a/conf/machine/include/machine-xilinx-default.inc
+++ b/conf/machine/include/machine-xilinx-default.inc
@@ -34,7 +34,3 @@ UBOOT_OFEMBED_zynq ?= "${@bb.utils.contains('PREFERRED_PROVIDER_virtual/bootload
 UBOOT_BINARY ?= "u-boot${UBOOT_OFEMBED}.${UBOOT_SUFFIX}"
 UBOOT_ELF ?= "u-boot"
 UBOOT_ELF_aarch64 ?= "u-boot.elf"
-
-# kernel modules for ZynqMP
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append_zynqmp = " kernel-module-mali"
-
diff --git a/conf/machine/zcu102-zynqmp.conf b/conf/machine/zcu102-zynqmp.conf
index 75a94a3..b2bb9dc 100644
--- a/conf/machine/zcu102-zynqmp.conf
+++ b/conf/machine/zcu102-zynqmp.conf
@@ -21,3 +21,6 @@ PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx"
 EXTRA_IMAGEDEPENDS += "\
 		arm-trusted-firmware \
 		"
+
+# The xczu9eg has a MALI GPU
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-module-mali"
-- 
1.9.1




More information about the meta-xilinx mailing list