summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/angstrom-2008.1.conf48
-rw-r--r--conf/distro/include/angstrom-glibc.inc6
2 files changed, 18 insertions, 36 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index ef41dec781..17029ec21e 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -85,42 +85,30 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
#powerpc needs additional patches to gcc
-PREFERRED_VERSION_gcc_ppc405 ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross_ppc405 ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-sdk_ppc405 ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial_ppc405 ?= "4.1.1"
-
-PREFERRED_VERSION_gcc_xilinx-ml403 ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross_xilinx-ml403 ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-sdk_xilinx-ml403 ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial_xilinx-ml403 ?= "4.1.1"
-
-PREFERRED_VERSION_gcc_mpc8323e-rdb ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross_mpc8323e-rdb ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-sdk_mpc8323e-rdb ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial_mpc8323e-rdb ?= "4.1.1"
-
-# GCC 4.3.0 is the first release with armv7-* support
-PREFERRED_VERSION_gcc_armv7a = "4.2.3+csl-arm-2008q1-126"
-PREFERRED_VERSION_gcc-cross_armv7a = "4.2.3+csl-arm-2008q1-126"
-PREFERRED_VERSION_gcc-cross-sdk_armv7a = "4.2.3+csl-arm-2008q1-126"
-PREFERRED_VERSION_gcc-cross-initial_armv7a = "4.2.3+csl-arm-2008q1-126"
-
-PREFERRED_VERSION_gcc ?= "4.2.2"
-PREFERRED_VERSION_gcc-cross ?= "4.2.2"
-PREFERRED_VERSION_gcc-cross-sdk ?= "4.2.2"
-PREFERRED_VERSION_gcc-cross-initial ?= "4.2.2"
+ANGSTROM_GCC_VERSION_ppc405 ?= "4.1.1"
+ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1"
+ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1"
+
+#for proper NEON support we need a CSL toolchain
+ANGSTROM_GCC_VERSION_armv7a = "4.2.1+csl-arm-2007q3-53"
+
+#avr32 only has support for gcc 4.2.2
+ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2"
+
+#Everybody else can just use this:
+ANGSTROM_GCC_VERSION ?= "4.2.2"
+
+PREFERRED_VERSION_gcc ?= "${ANGSTROM_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross ?= "${ANGSTROM_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross-sdk ?= "${ANGSTROM_GCC_VERSION}"
+PREFERRED_VERSION_gcc-cross-initial ?= "${ANGSTROM_GCC_VERSION}"
#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
require conf/distro/include/preferred-gpe-versions-2.8.inc
require conf/distro/include/preferred-e-versions.inc
require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
-#avr32 only has patches for binutils 2.17 and gcc 4.2.2 in OE
-PREFERRED_VERSION_gcc_avr32 = "4.2.2"
-PREFERRED_VERSION_gcc-cross_avr32 = "4.2.2"
-PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.2.2"
-PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.2.2"
+#avr32 only has patches for binutils 2.17 in OE
PREFERRED_VERSION_binutils_avr32 = "2.17"
PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index a9e9f3f7eb..8c76de6f1a 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -24,17 +24,11 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm'
FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -Os"
-FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -mfpu=neon -ftree-vectorize -mfloat-abi=softfp -frename-registers -fomit-frame-pointer -O2"
-TARGET_CC_ARCH_pn-glibc_armv7a = " -O3 -fno-tree-vectorize -march=armv7a -frename-registers -fomit-frame-pointer -mfloat-abi=softfp -mfpu=vfp "
-
FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1"
FULL_OPTIMIZATION_pn-glibc-intermediate = "-O2"
FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2"
FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
-FULL_OPTIMIZATION_pn-glibc_armv7a = " -O3 -fno-tree-vectorize -march=armv7a -frename-registers -fomit-frame-pointer -mfloat-abi=softfp -mfpu=vfp "
-CFLAGS_pn-glibc_armv7a = " -fexpensive-optimizations -O3 -fno-tree-vectorize -march=armv7a -frename-registers -fomit-frame-pointer -mfloat-abi=softfp -mfpu=vfp"
-
BUILD_OPTIMIZATION = "-Os"
BUILD_OPTIMIZATION_pn-perl = "-O1"
BUILD_OPTIMIZATION_pn-glibc-intermediate = "-O2"