Merge pull request #1338 from junzhuimx/master

Update uefi and fm-ucode to new revision; Fix the weston-init issue

1 files changed, 5 insertions, 4 deletions

diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend
index ffc26456..478c7cd6 100644
--- a/recipes-graphics/wayland/weston-init.bbappend
+++ b/recipes-graphics/wayland/weston-init.bbappend
@@ -24,11 +24,12 @@ 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               ?= ""
 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:mx8qm-nxp-bsp ?= ""
+INI_UNCOMMENT_USE_G2D:mx8qxp-nxp-bsp ?= ""
+INI_UNCOMMENT_USE_G2D:mx8dx-nxp-bsp ?= ""
+INI_UNCOMMENT_ASSIGNMENTS:append = " \
     ${INI_UNCOMMENT_USE_G2D} \
 "