angstrom: use eabi for armv4 and remove arm-oabi

With gcc 4.4.2 armv4 can use eabi

7 files changed, 9 insertions, 20 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
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index 69a5b23111..6a1f93bfb6 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 25ba8510a2..298e250362 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 004d90434c..4ca68389f7 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 ad499f7b67..92b8d8ba7e 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 01c2fb50b6..8bbd28ee93 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -141,15 +141,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 81ffed71f8..0000000000
--- 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"