Merge pull request #1028 from thochstein/master

Fix mx8dx machine override hierarchy

2 files changed, 5 insertions, 3 deletions

diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index 3dd2f55c0..7816ec407 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -147,9 +147,10 @@ HAS_GBM:mx8-nxp-bsp = "true"
 
 IMX_SOC        = "IMX_SOC_NOT_SET"
 IMX_SOC:mx8qm-nxp-bsp  = "mx8qm"
+IMX_SOC:mx8qxp-nxp-bsp = "mx8qxp"
+IMX_SOC:mx8dx-nxp-bsp  = "mx8qxp"
 IMX_SOC:mx8mp-nxp-bsp  = "mx8mp"
 IMX_SOC:mx8mq-nxp-bsp  = "mx8mq"
-IMX_SOC:mx8qxp-nxp-bsp = "mx8qxp"
 IMX_SOC:mx8mn-nxp-bsp  = "mx8mn"
 IMX_SOC:mx8ulp-nxp-bsp = "mx8ulp"
 
diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend
index 7aceb6b17..4ba6cba7f 100644
--- a/recipes-graphics/wayland/weston-init.bbappend
+++ b/recipes-graphics/wayland/weston-init.bbappend
@@ -27,9 +27,10 @@ INI_UNCOMMENT_ASSIGNMENTS:append:mx8mq-nxp-bsp = " \
 # FIXME: The 8QM and 8QXP SoCs have better performance without G2D so don't enable it
 # Ideally, this should be seamless and Vivante ought to handle it internally and take the fastest
 # rendering code.
-INI_UNCOMMENT_USE_G2D:imxgpu2d ?= "use-g2d=1"
-INI_UNCOMMENT_USE_G2D:mx8qm-nxp-bsp = ""
+INI_UNCOMMENT_USE_G2D:imxgpu2d      ?= "use-g2d=1"
+INI_UNCOMMENT_USE_G2D:mx8qm-nxp-bsp  = ""
 INI_UNCOMMENT_USE_G2D:mx8qxp-nxp-bsp = ""
+INI_UNCOMMENT_USE_G2D:mx8dx-nxp-bsp  = ""
 INI_UNCOMMENT_ASSIGNMENTS:append:imxgpu2d = " \
     ${INI_UNCOMMENT_USE_G2D} \
 "