5 files changed, 5 insertions, 11 deletions
diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf
index d8e9e36..3441deb 100644
--- a/conf/machine/apalis-imx6.conf
+++ b/conf/machine/apalis-imx6.conf
@@ -3,7 +3,7 @@
 #@SOC: i.MX6
 #@DESCRIPTION: Machine configuration for Toradex Apalis iMX6 SOM
 
-DEFAULTTUNE_mx6 = "armv7ahf-neon"
+DEFAULTTUNE_mx6 = "armv7at2hf-neon"
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa9.inc
 
diff --git a/conf/machine/apalis-t30.conf b/conf/machine/apalis-t30.conf
index 49dab92..cf60d54 100644
--- a/conf/machine/apalis-t30.conf
+++ b/conf/machine/apalis-t30.conf
@@ -47,7 +47,5 @@ EXTRA_IMAGEDEPENDS += "u-boot"
 SERIAL_CONSOLE = "115200 ttyS0"
 IMAGE_FSTYPES ?= "tar.bz2"
 
-# meta-angstrom/conf/distro/include/arm-defaults.inc
-# unconditionally adds thumb when not qualified with machine or SOC family
-DEFAULTTUNE_tegra = "armv7ahf-neon"
+DEFAULTTUNE = "armv7ahf-neon"
 require conf/machine/include/tune-cortexa9.inc
diff --git a/conf/machine/colibri-t20.conf b/conf/machine/colibri-t20.conf
index 308356e..f1c7925 100644
--- a/conf/machine/colibri-t20.conf
+++ b/conf/machine/colibri-t20.conf
@@ -46,9 +46,7 @@ SERIAL_CONSOLE = "115200 ttyS0"
 IMAGE_FSTYPES ?= "tar.bz2"
 
 # T20 does not have neon
-# meta-angstrom/conf/distro/include/arm-defaults.inc
-# unconditionally adds thumb when not qualified with machine or SOC family
-DEFAULTTUNE_tegra = "armv7ahf"
+DEFAULTTUNE = "armv7ahf"
 #choose a specific vfp, or we end up with the default vfpv2 optimization
 TUNE_CCARGS += "-mfpu=vfpv3-d16"
 require conf/machine/include/tune-cortexa9.inc
diff --git a/conf/machine/colibri-t30.conf b/conf/machine/colibri-t30.conf
index e9ceaea..4d1a003 100644
--- a/conf/machine/colibri-t30.conf
+++ b/conf/machine/colibri-t30.conf
@@ -48,6 +48,5 @@ SERIAL_CONSOLE = "115200 ttyS0"
 IMAGE_FSTYPES ?= "tar.bz2"
 
 # meta-angstrom/conf/distro/include/arm-defaults.inc
-# unconditionally adds thumb when not qualified with machine or SOC family
-DEFAULTTUNE_tegra3 = "armv7ahf-neon"
+DEFAULTTUNE = "armv7ahf-neon"
 require conf/machine/include/tune-cortexa9.inc
diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf
index d99f300..ed61392 100644
--- a/conf/machine/colibri-vf.conf
+++ b/conf/machine/colibri-vf.conf
@@ -4,8 +4,7 @@
 #@DESCRIPTION: Toradex Colibri VF50, Colibri VF61
 
 # meta-angstrom/conf/distro/include/arm-defaults.inc
-# unconditionally adds thumb when not qualified with machine or SOC family
-DEFAULTTUNE_vf = "armv7ahf-neon"
+DEFAULTTUNE = "armv7ahf-neon"
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa5.inc