1 files changed, 4 insertions, 6 deletions

diff --git a/meta/conf/distro/include/poky-eabi3.inc b/meta/conf/distro/include/poky-eabi3.inc
index 106e5db76e..11100175d7 100644
--- a/meta/conf/distro/include/poky-eabi3.inc
+++ b/meta/conf/distro/include/poky-eabi3.inc
@@ -1,11 +1,12 @@
 #
-# Poky configuration to use EABI
+# Poky configuration to use CSL 2006q1-6 derived toolchain (ARM EABI)
+# gcc 4.1.0-csl, binutils 2.17-csl, glibc 2.4
 #
 
 TARGET_VENDOR = "-poky"
 
-PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-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"
@@ -19,6 +20,3 @@ PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
 PREFERRED_VERSION_glibc ?= "2.4"
 PREFERRED_VERSION_glibc-intermediate ?= "2.4"
 PREFERRED_VERSION_elfutils ?= "0.108"
-
-GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
-UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"