summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2007-09-14 11:50:28 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2007-09-14 11:50:28 +0000
commit90081b4e92c2e57b0b12a496fd66759d826f67dc (patch)
treec5e8291317dcfa82794be6b17f1966908bb960b2
parent52fa2af356f28464f5c7c48b7d9c6ab4c12b3c3d (diff)
parent382cd505caf66d1777e487640b819a73a3facdee (diff)
merge of 'a36e23769513e1d9865ab5c60bcf73693b58581d'
and 'd92d2182662331d76f656089956e624ac7c79230'
-rw-r--r--conf/distro/include/moko-autorev.inc5
-rw-r--r--conf/machine/alix.conf6
-rw-r--r--conf/machine/include/tune-geodelx.conf6
3 files changed, 15 insertions, 2 deletions
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 3292631c43..5206d26cdd 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -1,3 +1,8 @@
+SRCREV_pn-libgsmd ?= "${AUTOREV}"
+SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}"
+SRCREV_pn-libmokojournal2 ?= "${AUTOREV}"
+SRCREV_pn-libmokopanelui2 ?= "${AUTOREV}"
+SRCREV_pn-libmokoui2 ?= "${AUTOREV}"
SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf
index 77312791dc..29af29a3b8 100644
--- a/conf/machine/alix.conf
+++ b/conf/machine/alix.conf
@@ -5,9 +5,9 @@
# http://pcengines.ch/alix1c.htm
# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
-TARGET_ARCH = "i686"
+TARGET_ARCH = "i586"
-PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
+PACKAGE_EXTRA_ARCHS = "x86 i386 i486 geode"
PREFERRED_PROVIDER_virtual/kernel = "linux"
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
@@ -17,6 +17,8 @@ GLIBC_EXTRA_OECONF = "--with-tls"
MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi"
+require conf/machine/include/tune-geodelx.conf
+
IMAGE_FSTYPES += "tar.gz"
MACHINE_EXTRA_RRECOMMENDS = "\
diff --git a/conf/machine/include/tune-geodelx.conf b/conf/machine/include/tune-geodelx.conf
new file mode 100644
index 0000000000..335fadec6e
--- /dev/null
+++ b/conf/machine/include/tune-geodelx.conf
@@ -0,0 +1,6 @@
+# Geode CPU has it's own target in GCC 4.3
+# in older versions k6-2 is closest
+#
+TARGET_CC_ARCH = "-march=k6-2"
+PACKAGE_ARCH = "geode"
+