X-Git-Url: https://git.ti.com/gitweb?p=glsdk%2Fmeta-ti-glsdk.git;a=blobdiff_plain;f=conf%2Fmachine%2Fam3517-evm.conf;h=0151fe961335155f449e8260602b3d101ff2292c;hp=e8170694f21b7724f5e2fad03f8e007b8cd6f271;hb=a32b383e97f0c4db1846ae4ad8b2910c99eb2dcf;hpb=37e525ba2cbde38f6429bc0876140fc5bceb1301

diff --git a/conf/machine/am3517-evm.conf b/conf/machine/am3517-evm.conf
index e817069..0151fe9 100644
--- a/conf/machine/am3517-evm.conf
+++ b/conf/machine/am3517-evm.conf
@@ -2,38 +2,25 @@
 #@NAME: AM3517 EVM
 #@DESCRIPTION: Machine configuration for the TI Sitara AM3517 EVM
 
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-XSERVER = "xserver-xorg \
-           xf86-input-evdev \
-           xf86-input-mouse \
-           xf86-input-tslib \
-           xf86-video-omapfb \
-           xf86-input-keyboard"
-
-GUI_MACHINE_CLASS = "smallscreen"
-
 require conf/machine/include/omap3.inc
 
-# Ship all kernel modules
+# Use built-in LCD by default
+XSERVER += "xf86-input-tslib"
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES += "touchscreen ethernet"
 
 IMAGE_FSTYPES += "ubi tar.gz"
 EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
 
-SERIAL_CONSOLE = "115200 ttyS2"
+SERIAL_CONSOLE = "115200 ttyO2"
 USE_VT = "2"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
 
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
-
-UBOOT_ARCH = "arm"
 UBOOT_MACHINE = "am3517_evm_config"
 XLOAD_MACHINE = "am3517evm_config"
 
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen ethernet"
-
 # NOTE: there are NAND and OneNAND versions of this board...
-
 # do ubiattach /dev/ubi_ctrl -m 4
 # From dmesg:
 # UBI: smallest flash I/O unit:    2048
@@ -48,4 +35,3 @@ MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
 # UBI: physical eraseblock size:   131072 bytes (128 KiB)
 # UBI: sub-page size:              512
 UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
-