From 1994796f5fae1ed4aca85f88b1ce1ac22eeeeb58 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Wed, 12 Jun 2019 19:09:49 +0000
Subject: [PATCH] libmali: add depends on kernel driver

---
 packages/graphics/libmali/package.mk   | 6 ++++++
 projects/Allwinner/devices/A64/options | 3 ---
 projects/Allwinner/devices/H3/options  | 3 ---
 projects/Allwinner/devices/H6/options  | 3 ---
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/packages/graphics/libmali/package.mk b/packages/graphics/libmali/package.mk
index 1aec97d59d..e8d4acf481 100644
--- a/packages/graphics/libmali/package.mk
+++ b/packages/graphics/libmali/package.mk
@@ -17,6 +17,12 @@ if listcontains "$MALI_FAMILY" "(t620|t720)"; then
   PKG_DEPENDS_TARGET+=" wayland"
 fi
 
+if [ "$LINUX" != "rockchip-4.4" ]; then
+  listcontains "$MALI_FAMILY" "4[0-9]+" && PKG_DEPENDS_TARGET+=" mali-utgard"
+  listcontains "$MALI_FAMILY" "t[0-9]+" && PKG_DEPENDS_TARGET+=" mali-midgard"
+  listcontains "$MALI_FAMILY" "g[0-9]+" && PKG_DEPENDS_TARGET+=" mali-bifrost"
+fi
+
 PKG_CMAKE_OPTS_TARGET="-DMALI_VARIANT=${MALI_FAMILY// /;}"
 
 if [ "$TARGET_ARCH" = "aarch64" ]; then
diff --git a/projects/Allwinner/devices/A64/options b/projects/Allwinner/devices/A64/options
index 724873f446..5d79fdd0fa 100644
--- a/projects/Allwinner/devices/A64/options
+++ b/projects/Allwinner/devices/A64/options
@@ -28,8 +28,5 @@
   # ATF platform
     ATF_PLATFORM="sun50i_a64"
 
-  # additional drivers to install:
-    ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS mali-utgard"
-
   # Mali GPU family
     MALI_FAMILY="400"
diff --git a/projects/Allwinner/devices/H3/options b/projects/Allwinner/devices/H3/options
index 1815848ad1..9656c4cbdb 100644
--- a/projects/Allwinner/devices/H3/options
+++ b/projects/Allwinner/devices/H3/options
@@ -37,8 +37,5 @@
   # Kernel target
     KERNEL_TARGET="zImage"
 
-  # additional drivers to install:
-    ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS mali-utgard"
-
   # Mali GPU family
     MALI_FAMILY="400"
diff --git a/projects/Allwinner/devices/H6/options b/projects/Allwinner/devices/H6/options
index b7440d96e4..40b25b1509 100644
--- a/projects/Allwinner/devices/H6/options
+++ b/projects/Allwinner/devices/H6/options
@@ -28,8 +28,5 @@
   # ATF platform
     ATF_PLATFORM="sun50i_h6"
 
-  # additional drivers to install:
-    ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS mali-midgard"
-
   # Mali GPU family
     MALI_FAMILY="t720"