merge of '5df8864bb6077e592cab2f4f7568f207380225e4'

     and 'e2cb5d1e0ecaf7ec345106320eaa9ab93d254714'

5 files changed, 7 insertions, 7 deletions

diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index fe7ca91ef2..2ebb06d5c0 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -2,6 +2,7 @@ PREFERRED_VERSION_automake-native = "1.10"
 PREFERRED_VERSION_busybox 	= "1.9.2"
 PREFERRED_VERSION_cairo		= "1.6.4"
 PREFERRED_VERSION_dbus 		= "1.2.1"
+PREFERRED_VERSION_dropbear      = "0.51"
 PREFERRED_VERSION_fontconfig	= "2.4.1"
 PREFERRED_VERSION_glib-2.0 	= "2.16.3"
 PREFERRED_VERSION_gst-pulse 	= "0.9.7"
@@ -18,4 +19,3 @@ PREFERRED_VERSION_pulseaudio 	= "0.9.10"
 PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
 PREFERRED_VERSION_udev 		= "118"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
-PREFERRED_VERSION_dropbear 	= "0.50"
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index 6842897dd1..6b1d3d4dc0 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -13,9 +13,9 @@ GUI_MACHINE_CLASS = "bigscreen"
 #Ship all kernel modules till the board support has matured enough
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
-include conf/machine/include/tune-arm1136jf-s.inc
+#include conf/machine/include/tune-arm1136jf-s.inc
 # requires gcc 4.3.0:
-#include conf/machine/include/tune-cortexa8.inc
+include conf/machine/include/tune-cortexa8.inc
 
 
 IMAGE_FSTYPES += "tar.bz2 jffs2"
diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf
index a4f8adcb60..5bf42da797 100644
--- a/conf/machine/efika.conf
+++ b/conf/machine/efika.conf
@@ -5,7 +5,7 @@
 TARGET_ARCH = "powerpc"
 PACKAGE_EXTRA_ARCHS = "ppc603e"
 
-#PREFERRED_PROVIDER_virtual/kernel ?= "linux-${MACHINE}"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-rt"
 
 MACHINE_FEATURES = "kernel26 usbhost ext2 alsa"
 
diff --git a/conf/machine/include/tune-cortexa8.inc b/conf/machine/include/tune-cortexa8.inc
index f886366f10..51f6f3d72b 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=neon -ftree-vectorize -mfloat-abi=softfp"
+TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp"
 FEED_ARCH = "armv7a"
 PACKAGE_ARCH = "armv7a"
diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf
index 2950ea3da0..5eb5c897c5 100644
--- a/conf/machine/omap3evm.conf
+++ b/conf/machine/omap3evm.conf
@@ -8,9 +8,9 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 XSERVER = "xserver-kdrive-fbdev"

 GUI_MACHINE_CLASS = "smallscreen"

 

-include conf/machine/include/tune-arm1136jf-s.inc

+#include conf/machine/include/tune-arm1136jf-s.inc

 # requires gcc 4.3.0:

-#include conf/machine/include/tune-cortexa8.inc

+include conf/machine/include/tune-cortexa8.inc

 

 # Ship all kernel modules

 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"