aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Kunze <thommycheck@gmx.de>2009-10-30 21:24:55 +0100
committerThomas Kunze <thommycheck@gmx.de>2009-11-02 23:56:59 +0100
commitafa006cd91c93bff03be0f4477a0f1cf5a1c9f28 (patch)
tree8acc2b210113e53ed401221b50cb1e6541347c9a
parent0e9b71b72a5427bb8c863d639eef030be398099d (diff)
downloadopenembedded-thesing/arm4-eabi-angstrom.zip
openembedded-thesing/arm4-eabi-angstrom.tar.gz
openembedded-thesing/arm4-eabi-angstrom.tar.bz2
angstrom: use eabi for armv4 and remove arm-oabithesing/arm4-eabi-angstrom
With gcc 4.4.2 armv4 can use eabi
-rw-r--r--conf/distro/angstrom-2008.1.conf8
-rw-r--r--conf/distro/include/angstrom-eglibc.inc2
-rw-r--r--conf/distro/include/angstrom-glibc.inc2
-rw-r--r--conf/distro/include/angstrom-uclibc.inc2
-rw-r--r--conf/distro/include/angstrom-uclinux-uclibc.inc2
-rw-r--r--conf/distro/include/angstrom.inc9
-rw-r--r--conf/distro/include/angstromoabi.inc4
7 files changed, 9 insertions, 20 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 1429fa0..c9022c2 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -116,10 +116,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}"
@@ -194,9 +198,7 @@ PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free"
#Silence a warning during parsing
PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-#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
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index 69a5b23..6a1f93b 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/conf/distro/include/angstrom-eglibc.inc
@@ -5,7 +5,7 @@ ANGSTROM_BLACKLIST_pn-libiconv = "the glibc builtin iconv replacement is used"
TARGET_OS = "linux"
-TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
+TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
TARGET_OS .= "${@['','-gnuspe'][bb.data.getVar('TARGET_ARCH',d,1) in ['ppc', 'powerpc'] and bb.data.getVar('MACHINE',d) in ['calamari']]}"
#TARGET_OS = "linux-gnuspe"
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index c8607c6..d92eb44 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -4,7 +4,7 @@ require conf/distro/include/glibc-${TOOLCHAIN_TYPE}.inc
ANGSTROM_BLACKLIST_pn-libiconv = "the glibc builtin iconv replacement is used"
TARGET_OS = "linux"
-TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
+TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
#mess with compiler flags to use -Os instead of -O2
#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc
index 004d904..4ca6838 100644
--- a/conf/distro/include/angstrom-uclibc.inc
+++ b/conf/distro/include/angstrom-uclibc.inc
@@ -9,7 +9,7 @@ USE_NLS_glib-2.0 = "yes"
USE_NLS_glib-2.0-native = "yes"
USE_NLS_gcc-cross = "no"
-TARGET_OS_UC = "linux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
+TARGET_OS_UC = "linux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARCH',d) in ['bfin']]}"
#mess with compiler flags to use -Os instead of -O2
diff --git a/conf/distro/include/angstrom-uclinux-uclibc.inc b/conf/distro/include/angstrom-uclinux-uclibc.inc
index ad499f7..92b8d8b 100644
--- a/conf/distro/include/angstrom-uclinux-uclibc.inc
+++ b/conf/distro/include/angstrom-uclinux-uclibc.inc
@@ -6,7 +6,7 @@ USE_NLS_glib-2.0 = "yes"
USE_NLS_glib-2.0-native = "yes"
USE_NLS_gcc-cross = "no"
-TARGET_OS_UC = "uclinux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
+TARGET_OS_UC = "uclinux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
#mess with compiler flags to use -Os instead of -O2
#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 669c8ad..ee7a3f4 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -139,15 +139,6 @@ FEED_ARCH ?= "${BASE_PACKAGE_ARCH}"
#blackfin machines
FEED_ARCH_bfin = "blackfin"
-#Tweak packaging for strongarm machines since they can't use EABI
-
-PACKAGE_EXTRA_ARCHS_collie = "arm-oabi"
-PACKAGE_EXTRA_ARCHS_h3600 = "arm-oabi"
-PACKAGE_EXTRA_ARCHS_h3800 = "arm-oabi"
-PACKAGE_EXTRA_ARCHS_simpad = "arm-oabi"
-PACKAGE_EXTRA_ARCHS_htcwallaby = "arm-oabi"
-
-
#Name the generated images in a sane way
IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${ANGSTROM_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}"
DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
diff --git a/conf/distro/include/angstromoabi.inc b/conf/distro/include/angstromoabi.inc
deleted file mode 100644
index 81ffed7..0000000
--- a/conf/distro/include/angstromoabi.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-require conf/distro/include/angstrom.inc
-
-PACKAGE_ARCH = "arm-oabi"
-BASE_PACKAGE_ARCH = "arm-oabi"