summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2007-06-05 02:30:41 +0000
committerMatthias Hentges <oe@hentges.net>2007-06-05 02:30:41 +0000
commit8a55be921673301bbc0150e5313c8b2b6b28d07e (patch)
treeaf5f15b4c016dafd39afe6b52749755a0ae27fab /conf/distro
parentaccb9b8ad19a19ff84d4476175119f01bf528144 (diff)
parent89ccdc8961e9239340d0c9241ec89095729670e6 (diff)
merge of '93c76dabe575881b7335e6aca044cb6fb6aceffe'
and 'fa1c000d2eb11e81b0552935ffbdfcbf497dde8a'
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/angstrom-2007.1.conf15
1 files changed, 9 insertions, 6 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 0458249125..b60daa00b3 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -178,9 +178,9 @@ MACHINE_KERNEL_VERSION = "2.6"
PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
# Virtuals:
PREFERRED_PROVIDER_virtual/db ?= "db"
@@ -224,12 +224,15 @@ PREFERRED_VERSION_binutils ?= "2.17.50.0.5"
PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.5"
-#avr32 only has patches for binutils 2.17 and gcc 4.0.2 in OE
-PREFERRED_VERSION_gcc_avr32 = "4.0.2"
-PREFERRED_VERSION_gcc-cross_avr32 = "4.0.2"
+#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc_avr32 = "avr32-gcc-cross"
+PREFERRED_VERSION_avr32-gcc = "4.1.2"
+PREFERRED_VERSION_avr32-gcc-cross = "4.1.2"
PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.0.2"
PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.0.2"
+
+
PREFERRED_VERSION_binutils_avr32 = "2.17"
PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"