[oe-commits] Roger Monk : am3517-evm: Machine config cleanup

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: cfd97bfc32fad5a81f179e5d44a790ca7a41cd6b
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=cfd97bfc32fad5a81f179e5d44a790ca7a41cd6b

Author: Roger Monk <r-monk at ti.com>
Date:   Wed Jun 30 18:00:00 2010 +0100

am3517-evm: Machine config cleanup

   * Remove legacy OMAP3517 extra machine
      * Only used internally - safe to remove
   * Add uboot preferred provider
   * Set Machine configs for uboot/xloader
   * Set VT

Signed-off-by: Roger Monk <r-monk at ti.com>
Signed-off-by: Koen Kooi <k-kooi at ti.com>

---

 conf/machine/am3517-evm.conf |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/conf/machine/am3517-evm.conf b/conf/machine/am3517-evm.conf
index 0ee57c4..05eb2c5 100644
--- a/conf/machine/am3517-evm.conf
+++ b/conf/machine/am3517-evm.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@NAME: omap3 EVM
-#@DESCRIPTION: Machine configuration for the TI omap3517 EVM
+#@NAME: AM3517 EVM
+#@DESCRIPTION: Machine configuration for the TI Sitara AM3517 EVM
 TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
@@ -15,20 +15,22 @@ GUI_MACHINE_CLASS = "smallscreen"
 
 require conf/machine/include/omap3.inc
 
-PACKAGE_EXTRA_ARCHS += "omap3517-evm"
-
 # Ship all kernel modules
 
 IMAGE_FSTYPES ?= "jffs2 tar.bz2"
 EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
 
 SERIAL_CONSOLE = "115200 ttyS2"
+USE_VT = "2"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
 
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
+PREFERRED_VERSION_u-boot = "git"
+
 UBOOT_ARCH = "arm"
-UBOOT_MACHINE = "omap3517_evm_config"
-XLOAD_MACHINE = "omap3517evm_config"
+UBOOT_MACHINE = "am3517_evm_config"
+XLOAD_MACHINE = "am3517evm_config"
 
 MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen ethernet"