From ed13f6909a0d3b0ef9aa695484ef0e846caabf68 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 15 Apr 2013 17:30:57 -0500
Subject: [PATCH] beagle: settings for new u-boot

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 hwpack/omap3-beagle-xm-v3.9.conf | 17 +++++++++++------
 hwpack/omap3-beagle-xm.conf      |  8 ++++++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/hwpack/omap3-beagle-xm-v3.9.conf b/hwpack/omap3-beagle-xm-v3.9.conf
index 747269e..f9d7c98 100644
--- a/hwpack/omap3-beagle-xm-v3.9.conf
+++ b/hwpack/omap3-beagle-xm-v3.9.conf
@@ -19,13 +19,13 @@ boot_name="u-boot.img"
 boot_image="bootz"
 boot_script="uEnv.txt"
 boot_fstype="fat"
-uboot_SCRIPT_ENTRY="loaduimage"
+uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="fatload"
 
 #Kernel:
-#http://rcn-ee.net/deb/wheezy-armhf/LATEST-${kernel_subarch}
-kernel_subarch="armv7"
-kernel_repo="EXPERIMENTAL"
+#http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap
+kernel_subarch="omap"
+kernel_repo="TESTING"
 
 usbnet_mem="16384"
 
@@ -39,5 +39,10 @@ conf_fdtfile=
 SERIAL="ttyO2"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-SERIAL_MODE=1
-USE_KMS=1
+#Has Old DSS2 omapfb framebuffer driver:
+VIDEO_CONSOLE="console=tty0"
+HAS_OMAPFB_DSS2=1
+VIDEO_DRV="omapfb.mode=dvi"
+VIDEO_OMAP_RAM="12MB"
+VIDEO_OMAPFB_MODE="dvi"
+VIDEO_TIMING="1280x720MR-16@60"
diff --git a/hwpack/omap3-beagle-xm.conf b/hwpack/omap3-beagle-xm.conf
index e3ec55c..5a41aee 100644
--- a/hwpack/omap3-beagle-xm.conf
+++ b/hwpack/omap3-beagle-xm.conf
@@ -9,23 +9,27 @@ conf_board="BEAGLEBOARD_XM"
 conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
 conf_bl_listfile="bootloader-ng"
 
+#Bootloader Partition:
 bootloader_location="fatfs_boot"
 boot_partition_size="100"
 spl_name="MLO"
 boot_name="u-boot.img"
 
+#Bootloader: u-boot settings
 boot_image="bootz"
 boot_script="uEnv.txt"
 boot_fstype="fat"
-uboot_SCRIPT_ENTRY="loaduimage"
+uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="fatload"
 
+#Kernel:
 #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap
 kernel_subarch="omap"
 kernel_repo="STABLE"
 
 usbnet_mem="16384"
 
+#Kernel: Bootloader Settings:
 conf_loadaddr="0x80300000"
 conf_initrdaddr="0x81600000"
 conf_zreladdr="0x80008000"
@@ -41,4 +45,4 @@ HAS_OMAPFB_DSS2=1
 VIDEO_DRV="omapfb.mode=dvi"
 VIDEO_OMAP_RAM="12MB"
 VIDEO_OMAPFB_MODE="dvi"
-VIDEO_TIMING="1280x720MR-16@60"1
+VIDEO_TIMING="1280x720MR-16@60"