diff --git a/tools/hwpack/imx6q-sabresd.conf b/tools/hwpack/imx6q-sabresd.conf
index 08d56dbd7525ba743af66becd0fd15f8de9c847e..5bdabea03cf38a6e16dcce5da3ac498ac823eb30 100644
--- a/tools/hwpack/imx6q-sabresd.conf
+++ b/tools/hwpack/imx6q-sabresd.conf
@@ -21,4 +21,5 @@ conf_kernel=
 usbnet_mem=
 dtb="imx6q-sabresd.dtb"
 SERIAL="ttymxc0"
+drm="etnaviv"
 drm_device_identifier=
diff --git a/tools/hwpack/udoo.conf b/tools/hwpack/udoo.conf
index 89d915a77fbb0fd46ee8eb2e19767ae6faa8973e..8261e6ab75ea0612295971c67fdf3a9a0efc7c9f 100644
--- a/tools/hwpack/udoo.conf
+++ b/tools/hwpack/udoo.conf
@@ -32,4 +32,5 @@ usbnet_mem=
 
 
 SERIAL="ttymxc1"
+drm="etnaviv"
 drm_device_identifier="HDMI-A-1"
diff --git a/tools/hwpack/wandboard.conf b/tools/hwpack/wandboard.conf
index 8aef8a4651b95003957eb3d7e44fe9855b844383..5b76e4aefbbe33aa7cb8205331dc29f75e9a6144 100644
--- a/tools/hwpack/wandboard.conf
+++ b/tools/hwpack/wandboard.conf
@@ -33,4 +33,5 @@ usbnet_mem=
 need_wandboard_firmware=1
 
 SERIAL="ttymxc0"
+drm="etnaviv"
 drm_device_identifier="HDMI-A-1"
diff --git a/tools/setup_sdcard.sh b/tools/setup_sdcard.sh
index f741241f84fef2b1ba556d98141a7bbdf3375c3c..28f2ff0f23c5ec2105cbcd18ccdf4765b79481b0 100755
--- a/tools/setup_sdcard.sh
+++ b/tools/setup_sdcard.sh
@@ -1483,11 +1483,7 @@ populate_rootfs () {
 			if [ -f ${TEMPDIR}/disk/usr/lib/xorg/modules/drivers/armada_drv.so ] ; then
 				sudo sed -i -e 's:modesetting:armada:g' ${TEMPDIR}/disk${wfile}
 				sudo sed -i -e 's:fbdev:armada:g' ${TEMPDIR}/disk${wfile}
-			else
-				sudo sed -i -e 's:modesetting:omap:g' ${TEMPDIR}/disk${wfile}
-				sudo sed -i -e 's:fbdev:omap:g' ${TEMPDIR}/disk${wfile}
 			fi
-			sudo sed -i -e 's:#HWcursor_false::g' ${TEMPDIR}/disk${wfile}
 			sudo sed -i -e 's:16:24:g' ${TEMPDIR}/disk${wfile}
 		fi
 	fi