1 files changed, 15 insertions, 6 deletions

diff --git a/meta/conf/distro/include/poky-eabi.inc b/meta/conf/distro/include/poky-eabi.inc
index 4161b3633b..4687bae3d7 100644
--- a/meta/conf/distro/include/poky-eabi.inc
+++ b/meta/conf/distro/include/poky-eabi.inc
@@ -1,6 +1,7 @@
 #
 # Poky's default configuration (ARM EABI)
-# gcc 4.1.2, binutils 2.18, glibc 2.5
+# gcc 4.2.3, binutils 2.18, glibc 2.5
+# use gcc 4.3.1 for armv7 targets
 #
 
 TARGET_VENDOR = "-poky"
@@ -11,11 +12,19 @@ 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"
 
-PREFERRED_VERSION_gcc ?= "4.2.3"
-PREFERRED_VERSION_gcc-cross ?= "4.2.3"
-PREFERRED_VERSION_gcc-cross-initial ?= "4.2.3"
-PREFERRED_VERSION_binutils ?= "2.18"
-PREFERRED_VERSION_binutils-cross ?= "2.18"
+GCCVERSION = "4.2.3"
+GCCVERSION_beagleboard = "4.3.1"
+GCCVERSION_omap-3430sdp = "4.3.1"
+GCCVERSION_omap-3430ldp = "4.3.1"
+# 4.2.3+csl-arm-2008q1-126 doesn't work
+
+BINUVERSION = "2.18"
+
+PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
+PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
+PREFERRED_VERSION_gcc-cross-initial ?= "${GCCVERSION}"
+PREFERRED_VERSION_binutils ?= "${BINUVERSION}"
+PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}"
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.24"
 PREFERRED_VERSION_glibc ?= "2.6.1"
 PREFERRED_VERSION_glibc-intermediate ?= "2.6.1"