* Linaro toolchain does not support ARM9 architecture.
* The Arago toolchain should be used if an ARM9 based SOC_FAMILY is being built.
* Introduce a new variable TC_SANE_DEFAULT that determines which toolchain to
  use depending on the machine's SOC_FAMILY.

Signed-off-by: Franklin S. Cooper Jr <[email protected]>
---
Changes compared to v1:
Use seperate variable TC_SANE_DEFAULT suggested by Denys.
This seperate variable avoids any Python overhead since the value is evaluated
only once.
This still allows the TOOLCHAIN_BRAND to be overridden in the local.conf file.

 meta-arago-distro/conf/distro/arago.conf |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/meta-arago-distro/conf/distro/arago.conf 
b/meta-arago-distro/conf/distro/arago.conf
index 3954360..33adc01 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -19,9 +19,13 @@ NO32LIBS = "0"
 # Set our distro features, don't forget all the standard libc ones
 DISTRO_FEATURES = "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget 
usbhost wifi xattr nfs zeroconf pci 3g ipv4 ipv6 pulseaudio 
${DISTRO_FEATURES_LIBC}"
 
+# ARM9 is not supported by the Linaro toolchain so default back to the Arago
+# toolchain for ARM9 based SOCs.
+TC_SANE_DEFAULT := 
"${@bb.utils.contains('SOC_FAMILY','omapl138','arago','linaro',d)}"
+
 # Toolchain should be selected by setting TOOLCHAIN_BRAND in local.conf
 # Set some sane defaults, in case someone forgets to set them in local.conf
-TOOLCHAIN_BRAND ?= "linaro"
+TOOLCHAIN_BRAND ?= "${TC_SANE_DEFAULT}"
 TOOLCHAIN_TYPE ?= "external"
 
 require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}-${TOOLCHAIN_BRAND}.inc
-- 
1.7.0.4

_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Reply via email to