1 files changed, 9 insertions, 5 deletions

diff --git a/recipes-graphics/waffle/waffle_%.bbappend b/recipes-graphics/waffle/waffle_%.bbappend
index caef3a1e..60825b6f 100644
--- a/recipes-graphics/waffle/waffle_%.bbappend
+++ b/recipes-graphics/waffle/waffle_%.bbappend
@@ -1,7 +1,11 @@
-PACKAGECONFIG_X11                 = ""
-PACKAGECONFIG_X11_append_imxgpu3d = " x11-egl glx"
+PACKAGECONFIG_IMXGPU_X11          = ""
+PACKAGECONFIG_IMXGPU_X11_imxgpu3d = "x11-egl glx"
+PACKAGECONFIG_IMXGPU_GBM          = "gbm"
+PACKAGECONFIG_IMXGPU_GBM_mx6      = ""
+PACKAGECONFIG_IMXGPU_GBM_mx7      = ""
 PACKAGECONFIG_imxgpu = " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gbm wayland', \
-       bb.utils.contains('DISTRO_FEATURES',     'x11', '${PACKAGECONFIG_X11}', \
-                                                       '', d), d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland',                     'wayland', \
+       bb.utils.contains('DISTRO_FEATURES',     'x11', '${PACKAGECONFIG_IMXGPU_X11}', \
+                                                                                  '', d), d)} \
+    ${PACKAGECONFIG_IMXGPU_GBM} \
 "