From 921d88863f33987459a5ffc81042e218a30492a0 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 17 Jan 2014 10:32:29 -0600
Subject: [PATCH] omap3-beagle-xm: move to v3.13-rcX and device tree only...

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 hwpack/dt-beagleboard-xm.conf | 61 -----------------------------------
 hwpack/omap3-beagle-xm.conf   | 17 +++-------
 2 files changed, 5 insertions(+), 73 deletions(-)
 delete mode 100644 hwpack/dt-beagleboard-xm.conf

diff --git a/hwpack/dt-beagleboard-xm.conf b/hwpack/dt-beagleboard-xm.conf
deleted file mode 100644
index 1c1e1b4..0000000
--- a/hwpack/dt-beagleboard-xm.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-#        --dtb dt-beagleboard-xm (BeagleBoard xMA/B/C (Device Tree):supported)
-
-#Bootloader:
-conf_board="omap3_beagle"
-conf_bl_http="https://rcn-ee.net/deb/tools/latest"
-conf_bl_listfile="bootloader-ng"
-
-#Bootloader Partition:
-conf_boot_fstype="fat"
-
-bootloader_location="fatfs_boot"
-spl_name="MLO"
-boot_name="u-boot.img"
-
-#Bootloader: u-boot features:
-
-#CONFIG_CMD_BOOTZ
-#bootz & zImage
-conf_uboot_CONFIG_CMD_BOOTZ=1
-
-#CONFIG_SUPPORT_RAW_INITRD
-#allows booting un-mkimage wrapped initrds
-conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
-
-#CONFIG_CMD_FS_GENERIC
-#allows using "load" over "fatload"/"ext2load"
-#conf_uboot_CONFIG_CMD_FS_GENERIC=1
-
-#uenvcmd avaiable?
-conf_uboot_use_uenvcmd=1
-#conf_uboot_no_uenvcmd="loaduimage"
-
-#can the bootloader auto detect the device: (*.dtb)?
-uboot_fdt_auto_detection=1
-
-#Kernel:
-#https://rcn-ee.net/deb/wheezy-armhf/LATEST-armv7
-kernel_subarch="armv7"
-kernel_repo="STABLE"
-
-usbnet_mem="16384"
-
-#Kernel: Bootloader Settings:
-conf_zreladdr="0x80008000"
-conf_loadaddr="0x80300000"
-conf_fdtaddr="0x815f0000"
-conf_initrdaddr="0x81600000"
-need_dtbs=1
-need_ti_connectivity_firmware=1
-conf_kernel_usb_not_builtin=1
-
-#SYSTEM="video"
-#SYSTEM="serial"
-
-SYSTEM="beagleboard"
-
-SERIAL="ttyO2"
-SERIAL_CONSOLE="${SERIAL},115200n8"
-
-USE_KMS=1
diff --git a/hwpack/omap3-beagle-xm.conf b/hwpack/omap3-beagle-xm.conf
index 19e5afc..fb6bc36 100644
--- a/hwpack/omap3-beagle-xm.conf
+++ b/hwpack/omap3-beagle-xm.conf
@@ -32,11 +32,11 @@ conf_uboot_use_uenvcmd=1
 #conf_uboot_no_uenvcmd="loaduimage"
 
 #can the bootloader auto detect the device: (*.dtb)?
-#uboot_fdt_auto_detection=1
+uboot_fdt_auto_detection=1
 
 #Kernel:
-#https://rcn-ee.net/deb/wheezy-armhf/LATEST-omap
-kernel_subarch="omap"
+#https://rcn-ee.net/deb/wheezy-armhf/LATEST-armv7
+kernel_subarch="armv7"
 kernel_repo="STABLE"
 
 usbnet_mem="16384"
@@ -46,8 +46,7 @@ conf_zreladdr="0x80008000"
 conf_loadaddr="0x80300000"
 conf_fdtaddr="0x815f0000"
 conf_initrdaddr="0x81600000"
-#conf_fdtfile="omap3-beagle-xm.dtb"
-#need_dtbs=1
+need_dtbs=1
 need_ti_connectivity_firmware=1
 
 #SYSTEM="video"
@@ -58,10 +57,4 @@ SYSTEM="beagleboard"
 SERIAL="ttyO2"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-#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"
+USE_KMS=1