Merge remote-tracking branch 'dm/opendreambox-1.6' into test_0701

[vuplus_openembedded] / conf / machine / ts72xx.conf

diff --git a/conf/machine/ts72xx.conf b/conf/machine/ts72xx.conf
index 632f304..3e0a869 100644 (file)
--- a/conf/machine/ts72xx.conf
+++ b/conf/machine/ts72xx.conf
@@ -3,17 +3,13 @@
 #@DESCRIPTION: Machine configuration for Technologic Systems TS-72xx SBC
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 
-MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost screen"
-
-# default is 2.6.22.6
-#PREFERRED_VERSION_linux = "2.6.23-rc5"
+MACHINE_FEATURES = "kernel26 ext2 usbhost bluetooth"
 
 SERIAL_CONSOLE = "115200 ttyAM0"
 USE_VT = "0"
-CMDLINE = "console=ttyAM0,115200 ip=192.168.1.3:192.168.1.2:192.168.1.2:255.255.255.0 root=/dev/nfs nfsroot=192.168.1.2:/media/data/devel/om2007.2/ts72xx/tmp/deploy/glibc/images/ts72xx/nfs_root"
+CMDLINE = "console=ttyAM0,115200 ip=192.168.1.3:192.168.1.2:192.168.1.2:255.255.255.0 root=/dev/nfs nfsroot=192.168.1.2:/media/data/devel/oe/ts72xx-stable/tmp/deploy/glibc/images/ts72xx/nfsroot"
 
 require conf/machine/include/tune-arm920t.inc