merge of '37cd5a414f2408369f6ae26d79cd5e331c29920b'

     and 'fbdf3fdc31b4f3390910821902b9b5c0b3a28dc0'

1 files changed, 5 insertions, 26 deletions

diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc
index 8b7d5be188..5aa789e5aa 100644
--- a/conf/machine/include/gumstix.inc
+++ b/conf/machine/include/gumstix.inc
@@ -7,15 +7,19 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
+#Compile with armv5te optimizations, incompatible with armv4(t) cpus
+require conf/machine/include/tune-xscale.inc
+
+
 PREFERRED_PROVIDER_virtual/kernel = "gumstix-kernel"
 KERNEL_IMAGETYPE = "uImage"
 RDEPENDS_kernel-base = ""
+
 KERNEL_IMAGE_MAXSIZE = "1048577"
 
 UBOOT_ENTRYPOINT = "a0008000"
 
 MACHINE_FEATURES += "kernel26 "
-COMBINED_FEATURES ?= ""
 
 IMAGE_FSTYPES = "jffs2 tar.gz"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash-uids"
@@ -27,28 +31,3 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS =     " \
 
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= " \
                                        "
-#
-# The following *should* be in a distro.conf file
-# We include them here to avoid creating a new distro
-
-PREFERRED_PROVIDER_classpath = "classpath"
-PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils"
-
-PREFERRED_VERSION_gumstix-kernel = "2.6.21"
-PREFERRED_VERSION_udev = "118"
-PREFERRED_VERSION_gnuplot = "4.0.0"
-PREFERRED_VERSION_dropbear = "0.47"
-PREFERRED_VERSION_wpa-supplicant = "0.5.8"
-PREFERRED_VERSION_bluez-utils = "3.24"
-PREFERRED_VERSION_bluez-utils-alsa = "3.24"
-PREFERRED_VERSION_bluez-libs = "3.24"
-PREFERRED_VERSION_bluez-gstreamer-plugin = "3.24"
-PREFERRED_VERSION_bluez-hcidump = "1.40"
-PREFERRED_VERSION_microwindows = "0.91"
-PREFERRED_VERSION_midori = "0.0.15"
-PREFERRED_VERSION_jamvm = "1.5.0"
-PREFERRED_VERSION_classpath = "0.96"
-PREFERRED_VERSION_qtopia-core = "4.3.3"
-PREFERRED_VERSION_uicmoc4-native = "4.3.3"
-
-SRCREV_pn-webkit-gtk = "28656"