From aecc1cab3a65fd8a42d3e9beb4ea1c10401a8ed8 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 22 Oct 2013 11:02:25 -0500
Subject: [PATCH] device: imx all to v3.12-rcX

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 hwpack/imx51-babbage.conf   |  5 ++---
 hwpack/imx53-qsb.conf       |  9 +++------
 hwpack/imx6q-sabrelite.conf | 13 +++++--------
 hwpack/imx6q-sabresd.conf   |  9 +++------
 4 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/hwpack/imx51-babbage.conf b/hwpack/imx51-babbage.conf
index 52a95df..b60a0fa 100644
--- a/hwpack/imx51-babbage.conf
+++ b/hwpack/imx51-babbage.conf
@@ -39,7 +39,8 @@ conf_uboot_use_uenvcmd=1
 #Kernel:
 #https://rcn-ee.net/deb/wheezy-armhf/LATEST-armv7
 kernel_subarch="armv7"
-kernel_repo="STABLE"
+#kernel_repo="STABLE"
+kernel_repo="TESTING"
 
 usbnet_mem=
 
@@ -59,5 +60,3 @@ SERIAL_CONSOLE="${SERIAL},115200n8"
 SERIAL_MODE=1
 
 VIDEO_CONSOLE="console=tty0"
-HAS_IMX_BLOB=1
-conf_imx_video="video=mxcdi1fb=RGB24,1280x720M@60"
diff --git a/hwpack/imx53-qsb.conf b/hwpack/imx53-qsb.conf
index 16869d6..288b01d 100644
--- a/hwpack/imx53-qsb.conf
+++ b/hwpack/imx53-qsb.conf
@@ -39,7 +39,8 @@ conf_uboot_use_uenvcmd=1
 #Kernel:
 #https://rcn-ee.net/deb/wheezy-armhf/LATEST-armv7
 kernel_subarch="armv7"
-kernel_repo="STABLE"
+#kernel_repo="STABLE"
+kernel_repo="TESTING"
 
 usbnet_mem=
 
@@ -56,8 +57,4 @@ SYSTEM="video"
 SERIAL="ttymxc0"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-SERIAL_MODE=1
-
-VIDEO_CONSOLE="console=tty0"
-HAS_IMX_BLOB=1
-conf_imx_video="video=mxcdi1fb=RGB24,1280x720M@60"
+USE_KMS=1
diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf
index f630449..ad7563e 100644
--- a/hwpack/imx6q-sabrelite.conf
+++ b/hwpack/imx6q-sabrelite.conf
@@ -1,5 +1,4 @@
 #!/bin/bash
-#https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts?id=refs/tags/v3.9-rc6
 #        --dtb imx6q-sabrelite (Boundary Devices: Freescale i.MX6Q Board:supported)
 
 SYSTEM="mx6qsabrelite"
@@ -37,7 +36,8 @@ conf_uboot_bootscript="6x_bootscript"
 #Kernel:
 #https://rcn-ee.net/deb/wheezy-armhf/LATEST-armv7
 kernel_subarch="armv7"
-kernel_repo="STABLE"
+#kernel_repo="STABLE"
+kernel_repo="TESTING"
 
 usbnet_mem=
 
@@ -50,14 +50,11 @@ conf_initrdaddr="0x12A00000"
 conf_fdtfile="imx6q-sabrelite.dtb"
 need_dtbs=1
 
+SYSTEM="video"
+
 SERIAL="ttymxc1"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-SERIAL_MODE=1
-
-VIDEO_CONSOLE="console=tty0"
-HAS_IMX_BLOB=1
-VIDEO_FB="mxcdi1fb"
-VIDEO_TIMING="RGB24,1280x720M@60"
+USE_KMS=1
 
 conf_note_bootloader="http://eewiki.net/display/linuxonarm/i.MX6x+SABRE+Lite+SPI+Flash+Recovery"
diff --git a/hwpack/imx6q-sabresd.conf b/hwpack/imx6q-sabresd.conf
index 5b3cc8d..f12f430 100644
--- a/hwpack/imx6q-sabresd.conf
+++ b/hwpack/imx6q-sabresd.conf
@@ -39,7 +39,8 @@ conf_uboot_use_uenvcmd=1
 #Kernel:
 #https://rcn-ee.net/deb/wheezy-armhf/LATEST-armv7
 kernel_subarch="armv7"
-kernel_repo="STABLE"
+#kernel_repo="STABLE"
+kernel_repo="TESTING"
 
 usbnet_mem=
 
@@ -57,8 +58,4 @@ SYSTEM="video"
 SERIAL="ttymxc0"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-SERIAL_MODE=1
-
-VIDEO_CONSOLE="console=tty0"
-HAS_IMX_BLOB=1
-conf_imx_video="video=mxcfb0:dev=hdmi,1280x720@60,if=RGB565"
+USE_KMS=1