diff options
| author | Marco Cavallini <m.cavallini@koansoftware.com> | 2010-07-24 09:30:34 +0200 |
|---|---|---|
| committer | Marco Cavallini <m.cavallini@koansoftware.com> | 2010-07-24 09:30:34 +0200 |
| commit | 5b4a88983b3545f8f894fcbaa420b884f4e13631 (patch) | |
| tree | d3e05a16826624d7ca98ab5ff3e21b4b1777f9b7 /conf | |
| parent | ede6af5e1d519f74fc101e9cc9ab76b446d6f19b (diff) | |
| parent | d4f0fb310f7d40f7a50f50fb12083fa258aa1eed (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | conf/machine/include/nios2.inc | 28 |
2 files changed, 1 insertions, 29 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index ebfe19d438..c2bb869d8c 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -2,4 +2,4 @@ # only SRCREVs included in more recipes should be here, otherwise put sane SRCREV to recipe directly OPKG_SRCREV ?= "543" -EFL_SRCREV ?= "49949" +EFL_SRCREV ?= "50438" diff --git a/conf/machine/include/nios2.inc b/conf/machine/include/nios2.inc index 6aa6538135..ccbfc36111 100644 --- a/conf/machine/include/nios2.inc +++ b/conf/machine/include/nios2.inc @@ -21,34 +21,6 @@ MACHINE_FEATURES ?= "kernel26" PREFERRED_PROVIDER_virtual/kernel ?= "linux-nios2" -# for now we pin gcc, glibc and binutils -# as these are the only versions that have -# nios2 support. -PREFERRED_VERSION_gcc-cross = "4.1.2" -PREFERRED_VERSION_gcc-cross-initial = "4.1.2" -PREFERRED_VERSION_gcc-cross-intermediate = "4.1.2" -PREFERRED_VERSION_binutils = "2.17.50.0.12" -PREFERRED_VERSION_binutils-cross = "2.17.50.0.12" -PREFERRED_VERSION_glibc = "2.5" -PREFERRED_VERSION_glibc-initial = "2.5" - -# uclibc does not work yet -# PREFERRED_VERSION_uclibc = "0.9.30.3" -# PREFERRED_VERSION_uclibc-initial = "0.9.30.3" - -# for now busybox 1.13.2 is the only one -# patched and tested for nios2 so pin this -# one too, until the other versions are updated -# for nios2 too. -PREFERRED_VERSION_busybox_nios2 = "1.13.2" - -# there are some issues cross-compiling when -# using linux-libc-headers-native as we get -# some native inc dirs when compiling crt stuff -# ASSUME_PROVIDED fixes this (but breaks compilation -# on old host systems like red hat 4. -ASSUME_PROVIDED += "linux-libc-headers-native" - # Set default for 16MB machines - can be overridden for more or less flash. ROOT_FLASH_SIZE ?= "12" |