summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-10-14 15:27:07 +0200
committerKoen Kooi <koen@openembedded.org>2009-10-14 16:01:26 +0200
commit8be279f5a48418db0b4c9142c0c9bd4ae0764e37 (patch)
treeb5cd0ac438848d47520404474dae8f69c79757e0 /conf
parent2512ba21856d0ffd942ddd3a7c834d585a117ff1 (diff)
angstrom: framework to select internal/external toolchain and brand (csl/generic for now)
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf2
-rw-r--r--conf/distro/angstrom-2008.1.conf12
-rw-r--r--conf/distro/include/angstrom-glibc.inc2
-rw-r--r--conf/distro/include/glibc-external.inc0
-rw-r--r--conf/distro/include/glibc-internal.inc0
-rw-r--r--conf/distro/include/toolchain-external.inc0
-rw-r--r--conf/distro/include/toolchain-internal.inc0
7 files changed, 9 insertions, 7 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index c2f7666ef2..7426095ba0 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -392,6 +392,8 @@ export PATH
CCACHE = "${@bb.which(bb.data.getVar('PATH', d, 1), 'ccache') and 'ccache '}"
TOOLCHAIN_OPTIONS = ""
+TOOLCHAIN_PATH ?= ""
+TOOLCHAIN_SYSPATH ?= ""
export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 76815d85e8..07c62a091c 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -36,6 +36,10 @@ require conf/distro/include/preferred-opie-versions-1.2.4.inc
DISTRO_TYPE ?= "debug"
#DISTRO_TYPE = "release"
+# Set the toolchain type (internal, external) and brand (generic, csl etc.)
+TOOLCHAIN_TYPE ?= "internal"
+TOOLCHAIN_BRAND ?= ""
+
# Ship just basic locale by default. Locales are big (~1Mb uncompr.), so
# shipping some adhoc subset will be still useless and size burden for
# users of all other languages/countries. Instead, worth to make it easy
@@ -128,12 +132,8 @@ PREFERRED_VERSION_binutils_avr32 = "2.17"
PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
-# Virtuals:
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
+# Toolchain virtuals:
+require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines
PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index dae149f471..fe78f48ea8 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -1,7 +1,7 @@
# glibc:
require conf/distro/include/glibc.inc
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
+require conf/distro/include/glibc-${TOOLCHAIN_TYPE}.inc
TARGET_OS = "linux"
TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
diff --git a/conf/distro/include/glibc-external.inc b/conf/distro/include/glibc-external.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/distro/include/glibc-external.inc
diff --git a/conf/distro/include/glibc-internal.inc b/conf/distro/include/glibc-internal.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/distro/include/glibc-internal.inc
diff --git a/conf/distro/include/toolchain-external.inc b/conf/distro/include/toolchain-external.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/distro/include/toolchain-external.inc
diff --git a/conf/distro/include/toolchain-internal.inc b/conf/distro/include/toolchain-internal.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/distro/include/toolchain-internal.inc