summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2006-04-16 12:32:20 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-16 12:32:20 +0000
commita55ff33a61a855119b2153e4efd0bb70848d4c56 (patch)
tree5bde8ddc5ba4ca19bdc814306dd1f7b02282caf6 /conf
parente548219776e8934492025573169b3c5e2f8a79d1 (diff)
parent969946fde68de68d55fc247dae905ce286c6f1a3 (diff)
merge of cfbb957e3ada5af6623a77618cbb69b758ffa0df
and fb37f14ba39a48391acea0b175557d1be9cd9e43
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/angstrom.conf5
-rw-r--r--conf/distro/unslung.conf4
2 files changed, 5 insertions, 4 deletions
diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
index e9e05201e8..daa85d5bda 100644
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/angstrom.conf
@@ -18,6 +18,7 @@ INHERIT += "package_ipk debian"
include conf/distro/include/multimachine.conf
#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
+PREFERRED_PROVIDER_qemu-native = "qemu-qop-nogfx-native"
ENABLE_BINARY_LOCALE_GENERATION ?= ""
@@ -31,8 +32,8 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
BUILD_OPTIMIZATION = "-Os"
-#EABI is softfloat by default, but let's make sure :)
-TARGET_FPU = "soft"
+#ARM EABI is softfloat by default, but let's make sure :)
+TARGET_FPU_arm = "soft"
PARALLEL_INSTALL_MODULES = "1"
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index a26e790fd5..7a147d8cf1 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -3,12 +3,12 @@
#@DESCRIPTION: Unslung Linux Distribution for the NSLU2
DISTRO_NAME = "Unslung"
-DISTRO_VERSION = "6.8-beta"
+DISTRO_VERSION = "6.9-alpha"
DISTRO_TYPE = "beta"
FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable"
FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/native/stable"
-FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/modules/cross/6.8-beta"
+FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/modules/cross/stable"
# pull in the frozen list of bbfiles
UNSLUNG_EXTRA_BBFILES ?= ""