[oe-commits] Martin Jansa : shr/merge: remove added config stuff as it just switched thumb->arm architecture, thumb should be fixed now in eglibc

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 6dd3461971f0cab6016de9242a94a74bf078a5f3
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=6dd3461971f0cab6016de9242a94a74bf078a5f3

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Fri Oct 30 23:36:37 2009 +0000

shr/merge: remove added config stuff as it just switched thumb->arm architecture, thumb should be fixed now in eglibc

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 conf/distro/shr.conf |   51 --------------------------------------------------
 1 files changed, 0 insertions(+), 51 deletions(-)

diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 5685718..29f9b73 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -36,39 +36,6 @@ require conf/distro/include/shr-autorev.inc
 
 include conf/distro/minimal.conf
 
-include conf/distro/include/angstrom-${LIBC}.inc
-# ARM920T and up can use thumb mode to decrease binary size at the expense of speed
-# (the complete story is a bit more nuanced due to cache starvation)
-# Angstrom turns on thumb for armv4t machine according to this RFC:
-# http://lists.linuxtogo.org/pipermail/angstrom-distro-devel/2008-October/002714.html
-
-# We can't do ARM_INSTRUCTION_SET_armv4t since that will un-overridable in recipes like gcc
-ANGSTROM_ARM_INSTRUCTION_SET ?= "arm"
-
-
-ARM_INSTRUCTION_SET = "${ANGSTROM_ARM_INSTRUCTION_SET}"
-# "arm" "thumb"
-#    The instruction set the compiler should use when generating application
-#    code.  The kernel is always compiled with arm code at present.  arm code
-#    is the original 32 bit ARM instruction set, thumb code is the 16 bit
-#    encoded RISC sub-set.  Thumb code is smaller (maybe 70% of the ARM size)
-#    but requires more instructions (140% for 70% smaller code) so may be
-#    slower.
-
-THUMB_INTERWORK = "yes"
-# "yes" "no"
-#    Whether to compile with code to allow interworking between the two
-#    instruction sets.  This allows thumb code to be executed on a primarily
-#    arm system and vice versa.  It is strongly recommended that DISTROs not
-#    turn this off - the actual cost is very small.
-
-# We don't want to keep OABI compat
-ARM_KEEP_OABI = "0"
-# Do keep OABI compat for om-gta01 to keep the gllin binary working
-ARM_KEEP_OABI_pn-linux-openmoko-2.6.24_om-gta01 = "1"
-ARM_KEEP_OABI_pn-linux-openmoko-2.6.28_om-gta01 = "1"
-
-
 #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
 PREFERRED_PROVIDER_qemu-native = "qemu-native"
 ENABLE_BINARY_LOCALE_GENERATION ?= "1"
@@ -76,24 +43,6 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "1"
 # We only want to build UTF8 locales
 LOCALE_UTF8_ONLY = "1"
 
-#qemu doesn't like this fp
-ENABLE_BINARY_LOCALE_GENERATION_ep9312 = "0"
-
-#qemu has taken a dislike to armeb as well
-ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
-
-#ARM EABI is softfloat by default, but let's make sure :)
-#make it overridable for platforms with FPU, like ep93xx or i.mx31
-TARGET_FPU_arm ?= "soft"
-TARGET_FPU_armeb ?= "soft"
-TARGET_FPU_ixp4xx ?= "soft"
-TARGET_FPU_ppc405 ?= "soft"
-
-TARGET_FPU_armv6 ?= "hard"
-TARGET_FPU_armv6-novfp ?= "soft"
-TARGET_FPU_armv7a ?= "hard"
-TARGET_FPU_ppc603e ?= "hard"
-
 CVS_TARBALL_STASH += "http://build.shr-project.org/sources/"
 
 PREMIRRORS = "(ftp|https?)$://.*/.* http://build.shr-project.org/sources/"