From 5bec8eb54337a16a65710c49b4c3a77f527f072f Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 19 Jul 2014 14:19:34 +0200 Subject: machine.conf: use arm instructions set Angstrom default on armv7a would be thumb2, however there are some recipes around with arm assembler which fails. --- conf/machine/apalis-t30.conf | 4 +++- conf/machine/colibri-t20.conf | 4 +++- conf/machine/colibri-t30.conf | 4 +++- conf/machine/colibri-vf.conf | 9 +++++---- 4 files changed, 14 insertions(+), 7 deletions(-) (limited to 'conf') diff --git a/conf/machine/apalis-t30.conf b/conf/machine/apalis-t30.conf index 461c5b1..169049c 100644 --- a/conf/machine/apalis-t30.conf +++ b/conf/machine/apalis-t30.conf @@ -44,5 +44,7 @@ EXTRA_IMAGEDEPENDS += "u-boot" SERIAL_CONSOLE = "115200 ttyS0" IMAGE_FSTYPES ?= "tar.bz2" -DEFAULTTUNE = "armv7ahf-neon" +# meta-angstrom/conf/distro/include/arm-defaults.inc +# unconditionally adds thumb when not qualified with machine or SOC family +DEFAULTTUNE_tegra = "armv7ahf-neon" require conf/machine/include/tune-cortexa9.inc diff --git a/conf/machine/colibri-t20.conf b/conf/machine/colibri-t20.conf index e251e47..70737bd 100644 --- a/conf/machine/colibri-t20.conf +++ b/conf/machine/colibri-t20.conf @@ -43,7 +43,9 @@ SERIAL_CONSOLE = "115200 ttyS0" IMAGE_FSTYPES ?= "tar.bz2" # T20 does not have neon -DEFAULTTUNE = "armv7ahf" +# meta-angstrom/conf/distro/include/arm-defaults.inc +# unconditionally adds thumb when not qualified with machine or SOC family +DEFAULTTUNE_tegra = "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 a7eaded..2c7fa0e 100644 --- a/conf/machine/colibri-t30.conf +++ b/conf/machine/colibri-t30.conf @@ -44,5 +44,7 @@ EXTRA_IMAGEDEPENDS += "u-boot" SERIAL_CONSOLE = "115200 ttyS0" IMAGE_FSTYPES ?= "tar.bz2" -DEFAULTTUNE = "armv7ahf-neon" +# meta-angstrom/conf/distro/include/arm-defaults.inc +# unconditionally adds thumb when not qualified with machine or SOC family +DEFAULTTUNE_tegra3 = "armv7ahf-neon" require conf/machine/include/tune-cortexa9.inc diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf index 0b85319..1c77b81 100644 --- a/conf/machine/colibri-vf.conf +++ b/conf/machine/colibri-vf.conf @@ -3,10 +3,11 @@ #@SOC: vf50 vf61 #@DESCRIPTION: Toradex Colibri VF50, Colibri VF61 -#use hard float -DEFAULTTUNE = "armv7ahf-neon" -include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa5.inc +# meta-angstrom/conf/distro/include/arm-defaults.inc +# unconditionally adds thumb when not qualified with machine or SOC family +DEFAULTTUNE_vf = "armv7ahf-neon" +require conf/machine/include/imx-base.inc +require conf/machine/include/tune-cortexa5.inc SOC_FAMILY = "vf:vf60" -- cgit v1.2.3