3 files changed, 9 insertions, 6 deletions

diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index 16a061e5..b7b44589 100644
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -34,7 +34,7 @@ KERNEL_DEVICETREE:use-mainline-bsp = " \
 
 ### u-boot-fslc settings ###
 SPL_BINARY:pn-u-boot-fslc = "SPL"
-UBOOT_CONFIG:pn-u-boot-fslc ??= "sd-fslc"
+UBOOT_CONFIG:pn-u-boot-fslc ??= "sd"
 UBOOT_SUFFIX:pn-u-boot-fslc = "img"
 
 ### u-boot-imx settings ###
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index 62ad478e..7c40a860 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -43,7 +43,7 @@ KERNEL_DEVICETREE:use-mainline-bsp = " \
 
 ### u-boot-fslc settings ###
 SPL_BINARY:pn-u-boot-fslc = "SPL"
-UBOOT_CONFIG:pn-u-boot-fslc ??= "sd-fslc"
+UBOOT_CONFIG:pn-u-boot-fslc ??= "sd"
 UBOOT_SUFFIX:pn-u-boot-fslc = "img"
 
 ### u-boot-imx settings ###
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 48d3ad2b..dcfb049b 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -73,8 +73,6 @@ PACKAGECONFIG ?= ""
 PACKAGECONFIG[valgrind] = ""
 
 # Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below
-IMX_PACKAGES_GBM     = ""
-IMX_PACKAGES_GBM:mx8-nxp-bsp = "libgbm-imx libgbm-imx-dev"
 PACKAGES =+ "libclc-imx libclc-imx-dev \
         libgl-imx libgl-imx-dev \
         libgles1-imx libgles1-imx-dev \
@@ -87,13 +85,18 @@ PACKAGES =+ "libclc-imx libclc-imx-dev \
         libegl-imx libegl-imx-dev \
         libgal-imx libgal-imx-dev \
         libvsc-imx \
-        ${IMX_PACKAGES_GBM} \
+        ${PACKAGES_GBM} \
         imx-gpu-viv-tools \
         imx-gpu-viv-demos \
-        libvulkan-imx libvulkan-imx-dev \
+        ${PACKAGES_VULKAN} \
         libopenvx-imx libopenvx-imx-dev \
         libnn-imx \
 "
+PACKAGES_GBM             = ""
+PACKAGES_GBM:mx8-nxp-bsp = "libgbm-imx libgbm-imx-dev"
+PACKAGES_VULKAN               = ""
+PACKAGES_VULKAN:aarch64       = "libvulkan-imx libvulkan-imx-dev"
+PACKAGES_VULKAN:mx8mm-nxp-bsp = ""
 python __anonymous () {
         has_vivante_kernel_driver_support = (d.getVar('MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT') or '0')
         if has_vivante_kernel_driver_support != '1':