From 863cefd73bd9153a0353939c1ea0c8409f19919d Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 22 Oct 2013 10:58:41 -0500
Subject: [PATCH] board: all wandboards to v3.12-rcX

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 README                     |  5 ++---
 hwpack/wandboard-dual.conf |  5 +++--
 hwpack/wandboard-quad.conf |  5 +++--
 hwpack/wandboard-solo.conf | 20 +++++++++-----------
 mk_mmc.sh                  |  5 ++---
 5 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/README b/README
index 188de49..4fd13a0 100644
--- a/README
+++ b/README
@@ -13,9 +13,10 @@ Required Options:
         Freescale based:
                 imx51-babbage
                 imx53-qsb
-                wandboard-dual
                 imx6q-sabrelite
                 imx6q-sabresd
+                wandboard-solo
+                wandboard-dual
                 wandboard-quad
         TI based:
                 am335x-bone-serial
@@ -26,8 +27,6 @@ Required Options:
                 omap4-panda
                 omap4-panda-a4
                 omap4-panda-es
-        Wandboard:
-                wandboard-solo
 
 Optional:
 --distro <distro>
diff --git a/hwpack/wandboard-dual.conf b/hwpack/wandboard-dual.conf
index aed0136..100fdc8 100644
--- a/hwpack/wandboard-dual.conf
+++ b/hwpack/wandboard-dual.conf
@@ -1,5 +1,5 @@
 #!/bin/bash
-#        --dtb wandboard-dual (Freescale based i.MX6 Wandboard (Dual Core))
+#        --dtb wandboard-dual (Freescale based i.MX6 Wandboard (Dual Core):supported)
 
 #Bootloader:
 conf_board="wandboard_dl"
@@ -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=
 
diff --git a/hwpack/wandboard-quad.conf b/hwpack/wandboard-quad.conf
index af0b4a0..9161b31 100644
--- a/hwpack/wandboard-quad.conf
+++ b/hwpack/wandboard-quad.conf
@@ -1,5 +1,5 @@
 #!/bin/bash
-#        --dtb wandboard-quad (Freescale based i.MX6 Wandboard (Quad Core))
+#        --dtb wandboard-quad (Freescale based i.MX6 Wandboard (Quad Core):supported)
 
 #Bootloader:
 conf_board="wandboard_quad"
@@ -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=
 
diff --git a/hwpack/wandboard-solo.conf b/hwpack/wandboard-solo.conf
index 1a2aae1..99274b2 100644
--- a/hwpack/wandboard-solo.conf
+++ b/hwpack/wandboard-solo.conf
@@ -1,5 +1,5 @@
 #!/bin/bash
-#        --dtb wandboard-solo (Freescale based i.MX6 Wandboard (Single Core) WandBoard Tree:supported)
+#        --dtb wandboard-solo (Freescale based i.MX6 Wandboard (Single Core):supported)
 
 #Bootloader:
 conf_board="wandboard_solo"
@@ -37,9 +37,10 @@ conf_uboot_use_uenvcmd=1
 #uboot_fdt_auto_detection=1
 
 #Kernel:
-#https://rcn-ee.net/deb/wheezy-armhf/LATEST-imx
-kernel_subarch="wand"
-kernel_repo="STABLE"
+#https://rcn-ee.net/deb/wheezy-armhf/LATEST-armv7
+kernel_subarch="armv7"
+#kernel_repo="STABLE"
+kernel_repo="TESTING"
 
 usbnet_mem=
 
@@ -49,16 +50,13 @@ conf_loadaddr="0x12000000"
 conf_fdtaddr="0x11000000"
 #initrdaddr = loadaddr + 10(mb) * 10 0000 = 0x12A0 0000 (10MB)
 conf_initrdaddr="0x12A00000"
-#conf_fdtfile="imx6dl-wandboard.dtb"
-#need_dtbs=1
+conf_fdtfile="imx6dl-wandboard.dtb"
+need_dtbs=1
+need_wandboard_firmware=1
 
 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
diff --git a/mk_mmc.sh b/mk_mmc.sh
index ac03e8c..3dbd2b6 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -1661,9 +1661,10 @@ usage () {
 			        Freescale:
 			                imx51-babbage
 			                imx53-qsb
-			                wandboard-dual
 			                imx6q-sabrelite
 			                imx6q-sabresd
+			                wandboard-solo
+			                wandboard-dual
 			                wandboard-quad
 			        TI:
 			                am335x-bone-serial
@@ -1674,8 +1675,6 @@ usage () {
 			                omap4-panda
 			                omap4-panda-a4
 			                omap4-panda-es
-			        Wandboard:
-			                wandboard-solo
 
 			Optional:
 			--distro <distro>