From b43d56254eca7b57973bb235461c4f3bc00d95b4 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Thu, 20 Dec 2012 10:30:41 -0600
Subject: [PATCH] hwpack: convert mx6qsabrelite -> --dtb imx6q-sabrelite

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 hwpack/imx6q-sabrelite.conf | 50 +++++++++++++++++++++++++++++++++++++
 mk_mmc.sh                   | 21 +++-------------
 2 files changed, 53 insertions(+), 18 deletions(-)
 create mode 100644 hwpack/imx6q-sabrelite.conf

diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf
new file mode 100644
index 0000000..459fed0
--- /dev/null
+++ b/hwpack/imx6q-sabrelite.conf
@@ -0,0 +1,50 @@
+#!/bin/bash
+#Reference: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=tree;f=arch/arm/boot/dts;hb=refs/tags/v3.7
+#        --dtb imx6q-sabrelite (Boundary Devices: Freescale i.MX6Q Board:supported)
+
+board="MX6QSABRELITE_D"
+SYSTEM="mx6qsabrelite"
+
+#Bootloader: http://rcn-ee.net/deb/tools/latest/bootloader-ng
+#ABI2:${board}:SPL http://rcn-ee.net/deb/tools/beagleboard/MLO-beagleboard-v2012.10-r1
+#ABI2:${board}:BOOT http://rcn-ee.net/deb/tools/beagleboard/u-boot-beagleboard-v2012.10-r1.img
+
+bootloader_http="http://rcn-ee.net/deb/tools/latest/"
+bootloader_latest_file="bootloader-ng"
+
+bootloader_location="dd_uboot_boot"
+dd_uboot_seek="2"
+dd_uboot_bs="512"
+boot_partition_size="64"
+boot_startmb="2"
+unset spl_name
+boot_name="u-boot.imx"
+
+boot_image="bootm"
+USE_UIMAGE=1
+boot_scr_wrapper=1
+boot_script="uEnv.txt"
+boot_fstype="ext2"
+
+#http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx
+kernel_subarch="imx"
+kernel_repo="TESTING"
+
+usbnet_mem=
+
+kernel_addr="0x10000000"
+initrd_addr="0x12000000"
+load_addr="0x10008000"
+dtb_addr="0x11ff0000"
+dtb_file="imx6q-sabrelite.dtb"
+need_dtbs=1
+
+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"
diff --git a/mk_mmc.sh b/mk_mmc.sh
index 2dd5068..22a0f39 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -1642,24 +1642,9 @@ function check_uboot_type {
 		convert_uboot_to_dtb_board
 		;;
 	mx6qsabrelite)
-		SYSTEM="mx6qsabrelite"
-		board="MX6QSABRELITE_D"
-		is_imx
-		SERIAL="ttymxc1"
-		SERIAL_CONSOLE="${SERIAL},115200"
-		boot_image="bootm"
-		USE_UIMAGE=1
-		dd_uboot_seek="2"
-		dd_uboot_bs="512"
-		kernel_addr="0x10000000"
-		initrd_addr="0x12000000"
-		load_addr="0x10008000"
-		dtb_addr="0x11ff0000"
-		dtb_file="imx6q-sabrelite.dtb"
-		kernel_repo="TESTING"
-		SERIAL_MODE=1
-		need_dtbs=1
-		boot_scr_wrapper=1
+		echo "Note: [--dtb imx6q-sabrelite] now replaces [--uboot mx6qsabrelite]"
+		source "${DIR}"/hwpack/imx6q-sabrelite.conf
+		convert_uboot_to_dtb_board
 		;;
 	*)
 		IN_VALID_UBOOT=1