diff --git a/projects/imx6/linux/4.4-xbian/linux.arm.conf b/projects/imx6/linux/4.4-xbian/linux.arm.conf
index 00eda6105d..426553ec1f 100644
--- a/projects/imx6/linux/4.4-xbian/linux.arm.conf
+++ b/projects/imx6/linux/4.4-xbian/linux.arm.conf
@@ -1475,9 +1475,9 @@ CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
-CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
+CONFIG_EXTRA_FIRMWARE="imx/sdma/sdma-imx6q.bin"
+CONFIG_EXTRA_FIRMWARE_DIR="firmware"
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
@@ -5860,7 +5860,8 @@ CONFIG_MXC_IPU=y
 #
 # Vivante GPU support
 #
-CONFIG_MXC_GPU_VIV=y
+# CONFIG_MXC_GPU_VIV is not set
+CONFIG_MXC_GPU_VIV_V5=y
 CONFIG_MXC_IPU_V3_FSL=y
 
 #
diff --git a/projects/imx6/options b/projects/imx6/options
index 1b9c96415e..704f08a4b9 100644
--- a/projects/imx6/options
+++ b/projects/imx6/options
@@ -33,13 +33,17 @@
     KERNEL_TARGET="zImage"
 
   # Kernel extra targets to build
-    KERNEL_UBOOT_EXTRA_TARGET="imx6q-cubox-i.dtb       imx6dl-cubox-i.dtb       \
-                               imx6q-hummingboard.dtb  imx6dl-hummingboard.dtb  \
-                               imx6q-hummingboard2.dtb imx6dl-hummingboard2.dtb \
-                               imx6q-tbs2910.dtb                                \
-                               imx6q-udoo.dtb          imx6dl-udoo.dtb          \
-                               imx6q-udoo-7lvds.dtb    imx6dl-udoo-7lvds.dtb    \
-                               imx6q-udoo-15lvds.dtb   imx6dl-udoo-15lvds.dtb"
+    KERNEL_UBOOT_EXTRA_TARGET="
+      imx6q-cubox-i.dtb               imx6dl-cubox-i.dtb               \
+      imx6q-cubox-i-som-v15.dtb       imx6dl-cubox-i-som-v15.dtb       \
+      imx6q-hummingboard.dtb          imx6dl-hummingboard.dtb          \
+      imx6q-hummingboard-som-v15.dtb  imx6dl-hummingboard-som-v15.dtb  \
+      imx6q-hummingboard2.dtb         imx6dl-hummingboard2.dtb         \
+      imx6q-hummingboard2-som-v15.dtb imx6dl-hummingboard2-som-v15.dtb \
+      imx6q-tbs2910.dtb                                                \
+      imx6q-udoo.dtb                  imx6dl-udoo.dtb                  \
+      imx6q-udoo-7lvds.dtb            imx6dl-udoo-7lvds.dtb            \
+      imx6q-udoo-15lvds.dtb           imx6dl-udoo-15lvds.dtb"
 
   # Additional kernel make parameters (for example to specify the u-boot loadaddress)
     KERNEL_MAKE_EXTRACMD=""
@@ -49,11 +53,6 @@
     if [ "$LINUX_VERSION" = "sr-3.14" ]; then
       LINUX="imx6-3.14-sr"
 
-      KERNEL_UBOOT_EXTRA_TARGET="$KERNEL_UBOOT_EXTRA_TARGET \
-             imx6q-cubox-i-som-v15.dtb       imx6dl-cubox-i-som-v15.dtb      \
-             imx6q-hummingboard-som-v15.dtb  imx6dl-hummingboard-som-v15.dtb \
-             imx6q-hummingboard2-som-v15.dtb imx6dl-hummingboard2-som-v15.dtb"
-
       # OpenGL-ES implementation to use
       OPENGLES="imx-gpu-viv"
     elif [ "$LINUX_VERSION" = "xbian-4.8" ]; then
@@ -67,7 +66,7 @@
       LIBCEC_TYPE="xbian"
 
       # OpenGL-ES implementation to use
-      OPENGLES="gpu-viv-bin-mx6q"
+      OPENGLES="imx-gpu-viv"
     fi
 
 ################################################################################