aboutsummaryrefslogtreecommitdiffstats
path: root/conf/distro/angstrom-2008.1.conf
diff options
context:
space:
mode:
authorThomas Kunze <thommycheck@gmx.de>2009-10-30 21:24:55 +0100
committerThomas Kunze <thommycheck@gmx.de>2009-12-21 22:20:50 +0100
commitee961dd30c417911edae2a0ba025e73c5a96958b (patch)
treed22153225b2ce08cee9f61ada6c82112ceea2141 /conf/distro/angstrom-2008.1.conf
parent205729691c0669307df0d08a7b3e2d7e3a54dcd9 (diff)
downloadopenembedded-ee961dd30c417911edae2a0ba025e73c5a96958b.tar.gz
angstrom: use eabi for armv4 and remove arm-oabi
With gcc 4.4.2 armv4 can use eabi
Diffstat (limited to 'conf/distro/angstrom-2008.1.conf')
-rw-r--r--conf/distro/angstrom-2008.1.conf8
1 files changed, 5 insertions, 3 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 26614adb72..1c4330ecc8 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -101,10 +101,14 @@ ANGSTROM_GCC_VERSION_bfin = "4.1.2"
#avr32 only has support for gcc 4.2.2
ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2"
+#armv4 needs at least gcc 4.4.2 for eabi
+ANGSTROM_GCC_VERSION_armv4 ?= "4.4.2"
+
#Everybody else can just use this:
ANGSTROM_GCC_VERSION ?= "4.3.3"
ANGSTROM_BINUTILS_VERSION ?= "2.18"
+ANGSTROM_BINUTILS_VERSION_armv4 ?= "2.20"
ANGSTROM_BINUTILS_VERSION_armv7a ?= "2.18.50.0.7"
PREFERRED_VERSION_binutils ?= "${ANGSTROM_BINUTILS_VERSION}"
@@ -137,9 +141,7 @@ ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4
ANGSTROM_BLACKLIST_pn-fso-apm = "regular apmd is good enough"
-#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
-ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
-require conf/distro/include/angstrom${ARM_ABI}.inc
+require conf/distro/include/angstrom.inc
# If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run
# We also take this opportunity to inject angstrom-version and the feed configs into the rootfs