From 965f1fd0395c926e53a54d32318dce392919fa88 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Thu, 11 Apr 2013 09:05:15 -0500
Subject: [PATCH] wandboard: we should be able to define the resolution now

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 hwpack/wandboard-dl.conf   |  3 ++-
 hwpack/wandboard-solo.conf |  3 ++-
 mk_mmc.sh                  | 28 ++++++++--------------------
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/hwpack/wandboard-dl.conf b/hwpack/wandboard-dl.conf
index 4bf3f90..e295f4e 100644
--- a/hwpack/wandboard-dl.conf
+++ b/hwpack/wandboard-dl.conf
@@ -46,4 +46,5 @@ SERIAL="ttymxc0"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
 VIDEO_CONSOLE="console=tty0"
-USE_KMS=1
+HAS_IMX_BLOB=1
+conf_imx_video="video=mxcfb0:dev=hdmi,1280x720@60,if=RGB565"
diff --git a/hwpack/wandboard-solo.conf b/hwpack/wandboard-solo.conf
index cdcb7e1..58340ec 100644
--- a/hwpack/wandboard-solo.conf
+++ b/hwpack/wandboard-solo.conf
@@ -46,4 +46,5 @@ SERIAL="ttymxc0"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
 VIDEO_CONSOLE="console=tty0"
-USE_KMS=1
+HAS_IMX_BLOB=1
+conf_imx_video="video=mxcfb0:dev=hdmi,1280x720@60,if=RGB565"
diff --git a/mk_mmc.sh b/mk_mmc.sh
index 00c380f..298ab94 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -632,20 +632,14 @@ function tweak_boot_scripts {
 	if [ "${HAS_IMX_BLOB}" ] && [ ! "${SERIAL_MODE}" ] ; then
 		#not used:
 		sed -i -e 's:UENV_VRAM::g' ${TEMPDIR}/bootscripts/${ALL}
-
-		#framebuffer=VIDEO_FB
-		sed -i -e 's:UENV_FB:framebuffer=VIDEO_FB:g' ${TEMPDIR}/bootscripts/${ALL}
-		sed -i -e 's:VIDEO_FB:'$VIDEO_FB':g' ${TEMPDIR}/bootscripts/${ALL}
-
-		#dvimode=VIDEO_TIMING
-		sed -i -e 's:UENV_TIMING:dvimode=VIDEO_TIMING:g' ${TEMPDIR}/bootscripts/${ALL}
-		sed -i -e 's:VIDEO_TIMING:'$VIDEO_TIMING':g' ${TEMPDIR}/bootscripts/${ALL}
+		sed -i -e 's:UENV_FB::g' ${TEMPDIR}/bootscripts/${ALL}
+		sed -i -e 's:UENV_TIMING::g' ${TEMPDIR}/bootscripts/${ALL}
 
 		#optargs=VIDEO_CONSOLE -> optargs=console=tty0
 		sed -i -e 's:VIDEO_CONSOLE:console=tty0:g' ${TEMPDIR}/bootscripts/${ALL}
 
-		#video=\${framebuffer}:${dvimode}
-		sed -i -e 's/VIDEO_DISPLAY/'video=\${framebuffer}:\${dvimode}'/g' ${TEMPDIR}/bootscripts/${ALL}
+		#video=mxcfb0:dev=hdmi,1280x720@60,if=RGB565
+		sed -i -e 's/VIDEO_DISPLAY/'${conf_imx_video}'/g' ${TEMPDIR}/bootscripts/${ALL}
 
 		#Debian Installer console
 		sed -i -e 's:DICONSOLE:tty0:g' ${TEMPDIR}/bootscripts/${NET}
@@ -706,20 +700,14 @@ function tweak_boot_scripts {
 		if [ "${HAS_IMX_BLOB}" ] ; then
 			#not used:
 			sed -i -e 's:UENV_VRAM::g' ${TEMPDIR}/bootscripts/${FINAL}
-
-			#framebuffer=VIDEO_FB
-			sed -i -e 's:UENV_FB:framebuffer=VIDEO_FB:g' ${TEMPDIR}/bootscripts/${FINAL}
-			sed -i -e 's:VIDEO_FB:'$VIDEO_FB':g' ${TEMPDIR}/bootscripts/${FINAL}
-
-			#dvimode=VIDEO_TIMING
-			sed -i -e 's:UENV_TIMING:dvimode=VIDEO_TIMING:g' ${TEMPDIR}/bootscripts/${FINAL}
-			sed -i -e 's:VIDEO_TIMING:'$VIDEO_TIMING':g' ${TEMPDIR}/bootscripts/${FINAL}
+			sed -i -e 's:UENV_FB::g' ${TEMPDIR}/bootscripts/${FINAL}
+			sed -i -e 's:UENV_TIMING::g' ${TEMPDIR}/bootscripts/${FINAL}
 
 			#optargs=VIDEO_CONSOLE -> optargs=console=tty0
 			sed -i -e 's:VIDEO_CONSOLE:console=tty0:g' ${TEMPDIR}/bootscripts/${FINAL}
 
-			#video=\${framebuffer}:${dvimode}
-			sed -i -e 's/VIDEO_DISPLAY/'video=\${framebuffer}:\${dvimode}'/g' ${TEMPDIR}/bootscripts/${FINAL}
+			#video=mxcfb0:dev=hdmi,1280x720@60,if=RGB565
+			sed -i -e 's/VIDEO_DISPLAY/'${conf_imx_video}'/g' ${TEMPDIR}/bootscripts/${FINAL}
 		fi
 
 		if [ "${USE_KMS}" ] ; then