From b67dde5b1984a597e7319b23ff90712469b3e5c5 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Thu, 29 Mar 2018 14:54:36 +0100
Subject: [PATCH] drivers/dpaa: reduce meson dependency lists

Meson build currently tracks the dependencies between libraries, which
can often make things easier, but has the side-effect of slowing down
the initial meson run if too many duplicated dependencies are provided.
Therefore, we remove dependencies from the dpaa items where other
dependencies already depend on those. This provides a noticable speed-up
in meson configuration runs when lots of sample apps are included in the
build.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Tested-by: Harry van Haaren <harry.van.haaren@intel.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/bus/dpaa/meson.build         | 2 +-
 drivers/bus/fslmc/meson.build        | 2 +-
 drivers/crypto/dpaa2_sec/meson.build | 2 +-
 drivers/event/dpaa/meson.build       | 2 +-
 drivers/event/dpaa2/meson.build      | 2 +-
 drivers/mempool/dpaa2/meson.build    | 2 +-
 drivers/net/dpaa/meson.build         | 2 +-
 drivers/net/dpaa2/meson.build        | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/bus/dpaa/meson.build b/drivers/bus/dpaa/meson.build
index f5c6d7bb61..d10b62c033 100644
--- a/drivers/bus/dpaa/meson.build
+++ b/drivers/bus/dpaa/meson.build
@@ -5,7 +5,7 @@ if host_machine.system() != 'linux'
         build = false
 endif
 
-deps += ['ethdev', 'eventdev']
+deps += ['eventdev']
 sources = files('base/fman/fman.c',
 		'base/fman/fman_hw.c',
 		'base/fman/netcfg_layer.c',
diff --git a/drivers/bus/fslmc/meson.build b/drivers/bus/fslmc/meson.build
index 78f9d92065..890d6c0910 100644
--- a/drivers/bus/fslmc/meson.build
+++ b/drivers/bus/fslmc/meson.build
@@ -5,7 +5,7 @@ if host_machine.system() != 'linux'
         build = false
 endif
 
-deps += ['ethdev', 'eventdev', 'kvargs']
+deps += ['eventdev', 'kvargs']
 sources = files('fslmc_bus.c',
 		'fslmc_vfio.c',
 		'mc/dpbp.c',
diff --git a/drivers/crypto/dpaa2_sec/meson.build b/drivers/crypto/dpaa2_sec/meson.build
index 0fb4d961e4..01afc5877b 100644
--- a/drivers/crypto/dpaa2_sec/meson.build
+++ b/drivers/crypto/dpaa2_sec/meson.build
@@ -5,7 +5,7 @@ if host_machine.system() != 'linux'
         build = false
 endif
 
-deps += ['bus_fslmc', 'security', 'mempool_dpaa2']
+deps += ['security', 'mempool_dpaa2']
 sources = files('dpaa2_sec_dpseci.c',
 		'mc/dpseci.c')
 
diff --git a/drivers/event/dpaa/meson.build b/drivers/event/dpaa/meson.build
index 9bbd6c2a15..0914f858ef 100644
--- a/drivers/event/dpaa/meson.build
+++ b/drivers/event/dpaa/meson.build
@@ -4,7 +4,7 @@
 if host_machine.system() != 'linux'
 	build = false
 endif
-deps += ['mempool_dpaa', 'bus_dpaa', 'pmd_dpaa']
+deps += ['pmd_dpaa']
 sources = files('dpaa_eventdev.c')
 
 allow_experimental_apis = true
diff --git a/drivers/event/dpaa2/meson.build b/drivers/event/dpaa2/meson.build
index 835460c5d5..de7a461553 100644
--- a/drivers/event/dpaa2/meson.build
+++ b/drivers/event/dpaa2/meson.build
@@ -4,7 +4,7 @@
 if host_machine.system() != 'linux'
 	build = false
 endif
-deps += ['mempool_dpaa2', 'bus_fslmc', 'bus_vdev', 'pmd_dpaa2']
+deps += ['bus_vdev', 'pmd_dpaa2']
 sources = files('dpaa2_hw_dpcon.c',
 		'dpaa2_eventdev.c')
 
diff --git a/drivers/mempool/dpaa2/meson.build b/drivers/mempool/dpaa2/meson.build
index 8b8b5186b3..90bab60697 100644
--- a/drivers/mempool/dpaa2/meson.build
+++ b/drivers/mempool/dpaa2/meson.build
@@ -5,7 +5,7 @@ if host_machine.system() != 'linux'
         build = false
 endif
 
-deps += ['mbuf', 'bus_fslmc']
+deps += ['bus_fslmc']
 sources = files('dpaa2_hw_mempool.c')
 
 # depends on fslmc bus which uses experimental API
diff --git a/drivers/net/dpaa/meson.build b/drivers/net/dpaa/meson.build
index a4c40a680d..62dec7b04d 100644
--- a/drivers/net/dpaa/meson.build
+++ b/drivers/net/dpaa/meson.build
@@ -4,7 +4,7 @@
 if host_machine.system() != 'linux'
 	build = false
 endif
-deps += ['bus_dpaa', 'mempool_dpaa']
+deps += ['mempool_dpaa']
 
 sources = files('dpaa_ethdev.c',
 		'dpaa_rxtx.c')
diff --git a/drivers/net/dpaa2/meson.build b/drivers/net/dpaa2/meson.build
index 8e96b5afa1..213f0d72f4 100644
--- a/drivers/net/dpaa2/meson.build
+++ b/drivers/net/dpaa2/meson.build
@@ -5,7 +5,7 @@ if host_machine.system() != 'linux'
         build = false
 endif
 
-deps += ['bus_fslmc', 'mempool_dpaa2']
+deps += ['mempool_dpaa2']
 sources = files('base/dpaa2_hw_dpni.c',
 		'dpaa2_ethdev.c',
 		'dpaa2_rxtx.c',
-- 
2.20.1