From: Tom Hochstein <[email protected]> Add imxgpu to simplify the conditional for imxgpu2d OR imxgpu3d. Note that i.MX 8MQ has no 2D, so the previous idiom of using imxgpu2d to mean any GPU is no longer correct.
Signed-off-by: Tom Hochstein <[email protected]> Signed-off-by: Otavio Salvador <[email protected]> --- Changes in v4: - Rebase due removal of imxdpu and imxdpublit overrides - Rebase due removal of mx8xx overrides, will be added in a later commit - Move virtual/libg2d to _imxgpu2d override Changes in v3: None Changes in v2: None conf/machine/include/imx-base.inc | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 419ab1bc..7bd57fe8 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -57,15 +57,15 @@ 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:imxgpu:imxgpu2d:imxgpu3d" +MACHINEOVERRIDES_EXTENDER_mx6dl = "imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc" +MACHINEOVERRIDES_EXTENDER_mx6sx = "imxpxp:imxgpu:imxgpu2d:imxgpu3d" +MACHINEOVERRIDES_EXTENDER_mx6sl = "imxpxp:imxgpu:imxgpu2d: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_mx7ulp = "imxpxp:imxgpu:imxgpu2d:imxgpu3d" MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \ mx6 \ @@ -110,13 +110,9 @@ MACHINE_SOCARCH_FILTER_append_imxvpu = " \ imx-vpuwrap \ libimxvpuapi \ " -MACHINE_SOCARCH_FILTER_append_imxgpu2d = " \ +MACHINE_SOCARCH_FILTER_append_imxgpu = " \ virtual/egl \ virtual/mesa \ - virtual/libg2d \ - virtual/libgl \ - virtual/libgles1 \ - virtual/libgles2 \ virtual/libopenvg \ cairo \ gstreamer1.0-plugins-bad \ @@ -124,6 +120,14 @@ MACHINE_SOCARCH_FILTER_append_imxgpu2d = " \ pango \ weston \ " +MACHINE_SOCARCH_FILTER_append_imxgpu2d = " \ + virtual/libg2d \ +" +MACHINE_SOCARCH_FILTER_append_imxgpu3d = " \ + virtual/libgl \ + virtual/libgles1 \ + virtual/libgles2 \ +" MACHINE_SOCARCH_FILTER_append_use-mainline-bsp = " \ virtual/egl \ virtual/libopenvg \ @@ -191,12 +195,8 @@ MACHINE_GSTREAMER_1_0_PLUGIN_mx6ull ?= "gstreamer1.0-plugins-imx-meta" MACHINE_GSTREAMER_1_0_PLUGIN_mx7d ?= "gstreamer1.0-plugins-imx-meta" # Determines if the SoC has support for Vivante kernel driver -SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0" -SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6q = "1" -SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6dl = "1" -SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6sx = "1" -SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6sl = "1" -SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx7ulp = "1" +SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0" +SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_imxgpu = "1" # Handle Vivante kernel driver setting: # 0 - machine does not have Vivante GPU driver support -- 2.18.0 -- _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
