6 files changed, 11 insertions, 31 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"
diff --git a/conf/machine/include/tune-cortexa8.inc b/conf/machine/include/tune-cortexa8.inc
index 6c3bdb6ee0..f886366f10 100644
--- a/conf/machine/include/tune-cortexa8.inc
+++ b/conf/machine/include/tune-cortexa8.inc
@@ -3,6 +3,6 @@
 # [2] http://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html 
 # [3] https://support.codesourcery.com/GNUToolchain/kbentry29
 
-TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp"
+TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp"
 FEED_ARCH = "armv7a"
 PACKAGE_ARCH = "armv7a"
diff --git a/conf/machine/include/tune-mips2.inc b/conf/machine/include/tune-mips2.inc
new file mode 100644
index 0000000000..b10d65f23d
--- /dev/null
+++ b/conf/machine/include/tune-mips2.inc
@@ -0,0 +1 @@
+TARGET_CC_ARCH = "-mips2"
diff --git a/conf/machine/rb500.conf b/conf/machine/rb500.conf
index e17ca31bcb..30676b2fc4 100644
--- a/conf/machine/rb500.conf
+++ b/conf/machine/rb500.conf
@@ -3,5 +3,6 @@
 #@DESCRIPTION: Machine configuration for the MIPS based Routerboard
 
 TARGET_ARCH = "mipsel"
-TARGET_CC_ARCH = "-Os -mips2"
 PREFERRED_PROVIDER_virtual/kernel = "linux-rb500"
+
+include conf/machine/include/tune-mips2.inc
diff --git a/conf/machine/wl500g.conf b/conf/machine/wl500g.conf
index f2e4006a8f..5ed227dfa3 100644
--- a/conf/machine/wl500g.conf
+++ b/conf/machine/wl500g.conf
@@ -5,4 +5,4 @@
 TARGET_ARCH = "mipsel"
 MACHINE_FEATURES = "kernel26 usbhost wifi ext2"
 
-TARGET_CC_ARCH = "-Os -mips2"
+include conf/machine/include/mips2.inc
diff --git a/conf/machine/wrt54.conf b/conf/machine/wrt54.conf
index f61570a950..1b07df2666 100644
--- a/conf/machine/wrt54.conf
+++ b/conf/machine/wrt54.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the MIPS based WRT54G(S) devices
 
 TARGET_ARCH = "mipsel"
-TARGET_CC_ARCH = "-Os"
 
 SERIAL_CONSOLE = "tts/0"
 
@@ -31,4 +30,4 @@ INHERIT += "wrt-image"
 # strip even more: 
 # would be nice but breaks automatic shared library dependencies
 #DEPENDS_prepend = "${@["elfkickers-native ", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}"
-#export STRIP = "sstrip"
-\ No newline at end of file
+#export STRIP = "sstrip"