[meta-freescale] [PATCH v3 05/19] imx-base.inc: Add imxdpu and imxdpublit to MACHINEOVERRIDES_EXTENDER

[Otavio Salvador]

From: Tom Hochstein <tom.hochstein at nxp.com>

- imx-gpu-g2d requires DPU-blit support
- imx-dpu-g2d requires DPU support

Signed-off-by: Tom Hochstein <tom.hochstein at nxp.com>
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
---

Changes in v3: None
Changes in v2: None

 conf/machine/include/imx-base.inc                  | 14 +++++++-------
 recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb  |  4 +++-
 .../imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb          |  4 +++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 2e8f03a6..2bf79541 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -59,17 +59,17 @@ DEFAULTTUNE_vf ?= "cortexa5thf-neon"
 INHERIT += "machine-overrides-extender"
 
 MACHINEOVERRIDES_EXTENDER_mx25   = "use-mainline-bsp"
-MACHINEOVERRIDES_EXTENDER_mx6q   = "imxipu:imxvpu:imxgpu2d:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx6dl  = "imxpxp:imxipu:imxvpu:imxgpu2d:imxgpu3d:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx6sx  = "imxpxp:imxgpu2d:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx6sl  = "imxpxp:imxgpu2d:imxepdc"
+MACHINEOVERRIDES_EXTENDER_mx6q   = "imxipu:imxvpu:imxgpu2d:imxdpublit:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx6dl  = "imxpxp:imxipu:imxvpu:imxgpu2d:imxdpublit:imxgpu3d:imxepdc"
+MACHINEOVERRIDES_EXTENDER_mx6sx  = "imxpxp:imxgpu2d:imxdpublit:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx6sl  = "imxpxp:imxgpu2d:imxdpublit:imxepdc"
 MACHINEOVERRIDES_EXTENDER_mx6sll = "imxpxp:imxepdc"
 MACHINEOVERRIDES_EXTENDER_mx6ul  = "imxpxp"
 MACHINEOVERRIDES_EXTENDER_mx6ull = "imxpxp:imxepdc"
 MACHINEOVERRIDES_EXTENDER_mx7d   = "imxpxp:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxpxp:imxgpu2d:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx8mq  = "imxvpu:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx8mm  = "imxvpu:imxgpu2d:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxpxp:imxgpu2d:imxdpublit:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx8mq  = "imxvpu:imxdpu:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx8mm  = "imxvpu:imxgpu2d:imxdpu:imxgpu3d"
 
 MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \
     mx6 \
diff --git a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb
index dd3aa9dd..9a89fa66 100644
--- a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb
+++ b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.2.bb
@@ -34,4 +34,6 @@ INSANE_SKIP_${PN} += "ldflags"
 FILES_${PN} = "${libdir}/libg2d* /opt"
 FILES_${PN}-dev = "${libdir}/libg2d${SOLIBSDEV} ${includedir}"
 
-COMPATIBLE_MACHINE = "(mx8mm)"
+# Compatible only with i.MX DPU
+COMPATIBLE_MACHINE = "(^$)"
+COMPATIBLE_MACHINE_imxdpu = "${MACHINE}"
diff --git a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb b/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb
index eab1d31b..a4dbe4e3 100644
--- a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb
+++ b/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.2.bb
@@ -35,4 +35,6 @@ FILES_${PN} = "${libdir}/libg2d* /opt"
 FILES_${PN}-dev = "${includedir}"
 INSANE_SKIP_${PN} = "ldflags"
 
-COMPATIBLE_MACHINE = "(mx6|mx7ulp)"
+# Compatible only with i.MX DPU-blit
+COMPATIBLE_MACHINE = "(^$)"
+COMPATIBLE_MACHINE_imxdpublit = "${MACHINE}"
-- 
2.18.0