From 4ede8ac110a77d72aff3e988984a404a6602b451 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 17 Dec 2012 13:07:53 -0600
Subject: [PATCH] hwpack: convert mx51evk -> --dtb imx51-babbage

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 hwpack/imx51-babbage.conf   | 49 +++++++++++++++++++++++++++++++++++++
 hwpack/omap3-beagle-xm.conf |  1 +
 hwpack/omap4-panda.conf     |  1 +
 mk_mmc.sh                   | 14 +++--------
 4 files changed, 54 insertions(+), 11 deletions(-)
 create mode 100644 hwpack/imx51-babbage.conf

diff --git a/hwpack/imx51-babbage.conf b/hwpack/imx51-babbage.conf
new file mode 100644
index 0000000..ce53c27
--- /dev/null
+++ b/hwpack/imx51-babbage.conf
@@ -0,0 +1,49 @@
+#!/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 imx51-babbage (Freescale i.MX51 Babbage Board:supported)
+
+board="MX51EVK"
+SYSTEM="mx51evk"
+
+#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_primary_http="http://rcn-ee.net/deb/tools/latest/"
+#bootloader_backup_http="http://rcn-ee.homeip.net:81/dl/mirrors/deb/tools/latest/"
+bootloader_latest_file="bootloader-ng"
+
+bootloader_location="dd_uboot_boot"
+dd_uboot_seek="1"
+dd_uboot_bs="1024"
+boot_partition_size="64"
+boot_startmb="2"
+unset spl_name
+boot_name="u-boot.imx"
+
+boot_image="bootz"
+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="0x90010000"
+initrd_addr="0x92000000"
+load_addr="0x90008000"
+dtb_addr="0x91ff0000"
+dtb_file="imx51-babbage.dtb"
+need_dtbs=1
+
+SERIAL="ttymxc0"
+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/hwpack/omap3-beagle-xm.conf b/hwpack/omap3-beagle-xm.conf
index 8fe2792..e60a154 100644
--- a/hwpack/omap3-beagle-xm.conf
+++ b/hwpack/omap3-beagle-xm.conf
@@ -32,6 +32,7 @@ kernel_addr="0x80300000"
 initrd_addr="0x81600000"
 load_addr="0x80008000"
 dtb_addr="0x815f0000"
+dtb_file=
 
 SERIAL="ttyO2"
 SERIAL_CONSOLE="${SERIAL},115200n8"
diff --git a/hwpack/omap4-panda.conf b/hwpack/omap4-panda.conf
index eff2c55..7b9acdf 100644
--- a/hwpack/omap4-panda.conf
+++ b/hwpack/omap4-panda.conf
@@ -32,6 +32,7 @@ kernel_addr="0x80300000"
 initrd_addr="0x81600000"
 load_addr="0x80008000"
 dtb_addr="0x815f0000"
+dtb_file=
 
 SERIAL="ttyO2"
 SERIAL_CONSOLE="${SERIAL},115200n8"
diff --git a/mk_mmc.sh b/mk_mmc.sh
index 5c2a52d..470ce77 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -1758,17 +1758,9 @@ function check_uboot_type {
 		SERIAL_MODE=1
 		;;
 	mx51evk)
-		SYSTEM="mx51evk"
-		board="MX51EVK"
-		is_imx
-		kernel_addr="0x90010000"
-		initrd_addr="0x92000000"
-		load_addr="0x90008000"
-		dtb_addr="0x91ff0000"
-		dtb_file="imx51-babbage.dtb"
-		kernel_repo="TESTING"
-		SERIAL_MODE=1
-		need_dtbs=1
+		echo "Note: [--dtb imx51-babbage] now replaces [--uboot mx51evk]"
+		source "${DIR}"/hwpack/imx51-babbage.conf
+		convert_uboot_to_dtb_board
 		;;
 	mx53loco)
 		SYSTEM="mx53loco"