diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2009-03-04 16:16:02 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2009-03-04 16:16:02 -0800 |
| commit | 8845f5ed58115403abbaffc496180d160da5c09f (patch) | |
| tree | 0820bfc9b5ada850a8f0ccf5834cb7ac5dfd8b57 /conf/distro | |
| parent | c2f21de4041e962705e2e31dc7c50fed7877547a (diff) | |
| parent | a587bd1605a3cd9379ce5cb3954977722f001db8 (diff) | |
| download | openembedded-8845f5ed58115403abbaffc496180d160da5c09f.tar.gz | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 6 | ||||
| -rw-r--r-- | conf/distro/include/sane-toolchain.inc | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index f2385b32a3..d629c4adc4 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -183,9 +183,9 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "4913" SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "517" SRCREV_pn-openocd-native ?= "517" -SRCREV_pn-opkg ?= "202" -SRCREV_pn-opkg-native ?= "201" -SRCREV_pn-opkg-sdk ?= "201" +SRCREV_pn-opkg ?= "203" +SRCREV_pn-opkg-native ?= "203" +SRCREV_pn-opkg-sdk ?= "203" SRCREV_pn-opkg-utils ?= "4578" SRCREV_pn-opkg-utils-native ?= "4595" SRCREV_pn-oprofileui ?= "173" diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc index 0d859903e1..b261d635af 100644 --- a/conf/distro/include/sane-toolchain.inc +++ b/conf/distro/include/sane-toolchain.inc @@ -73,7 +73,7 @@ PREFERRED_ARM_INSTRUCTION_SET ?= "arm" PREFERRED_ARM_INSTRUCTION_SET_armv4t = "thumb" PREFERRED_ARM_INSTRUCTION_SET_armv5te = "thumb" PREFERRED_ARM_INSTRUCTION_SET_armv5teb = "thumb" -ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET} +ARM_INSTRUCTION_SET = "${PREFERRED_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 @@ -91,9 +91,6 @@ THUMB_INTERWORK = "yes" # 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" # ARM EABI is softfloat by default, but let's make sure :) # make it overridable for platforms with FPU, like ep93xx or i.mx31 @@ -108,7 +105,8 @@ TARGET_FPU_armv7a ?= "hard" TARGET_FPU_ppc603e ?= "hard" # webkit-gtk and cairo have alignment issues with double instructions on armv5 so -# disable them here +# disable them here. TODO: This knowledge should rather be encoded in the actual +# recipes! TARGET_CC_ARCH_pn-webkit-gtk_armv5te = "-march=armv4t" TARGET_CC_ARCH_pn-cairo_armv5te = "-march=armv4t" |