aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2009-11-21 23:03:36 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2009-11-21 23:03:36 +0100
commit80402d4b6d357070c93fa541f50f2466b2a3e7b9 (patch)
treeda6a2f8ccb009a640958e81c3eecf9af7c0d9516 /conf
parentf1a2168b53550ff5fa9bacd85a1092b20e05e2e8 (diff)
parent2f15c139108411520a235708e3a3b697eb12b497 (diff)
downloadopenembedded-80402d4b6d357070c93fa541f50f2466b2a3e7b9.tar.gz
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/sane-srcrevs-fso.inc2
-rw-r--r--conf/machine/include/tune-atom.inc4
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index 0fa5efbde3..8e960d0d66 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -3,7 +3,7 @@
# FSO Projects -- Cornucopia
FSO_CORNUCOPIA_SRCREV ?= "1dcf546fb0423930f938129a51f538874c172226"
SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsodeviced ?= "a8abe5bbe86c5625ab4c649eae899b9a8aac4b2d"
+SRCREV_pn-fsodeviced ?= "f7ef257660227403dc352423066deeeabaf1fa73"
SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}"
SRCREV_pn-fsogpsd ?= "${FSO_CORNUCOPIA_SRCREV}"
SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}"
diff --git a/conf/machine/include/tune-atom.inc b/conf/machine/include/tune-atom.inc
index b1f6453526..a7dd04f596 100644
--- a/conf/machine/include/tune-atom.inc
+++ b/conf/machine/include/tune-atom.inc
@@ -2,7 +2,7 @@
# TARGET_CC_ARCH = "-march=i586"
#
# GCC 4.3.1+ (see Gentoo)
-#TARGET_CC_ARCH = "-march=core2"
+TARGET_CC_ARCH = "-march=core2"
# GCC 4.4.2+ (see Fedora 12)
-TARGET_CC_ARCH = "-march=i686 -mtune=atom"
+#TARGET_CC_ARCH = "-march=i686 -mtune=atom"