summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2007-07-26 14:03:07 +0000
committerMichael Lauer <mickey@vanille-media.de>2007-07-26 14:03:07 +0000
commitadc6f74c5f0826e821013d81ddd67c082f2f694d (patch)
treec1f437dcbbf8262240df77b6d04db76ff8c4c557
parent623b1746e32bd1c071f6d3669776ff47ac762eda (diff)
openmoko.conf: base on angstrom-2007.1.conf
-rw-r--r--conf/distro/angstrom-2007.1.conf6
-rw-r--r--conf/distro/openmoko.conf21
2 files changed, 8 insertions, 19 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 17690d8277..e83ef90280 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -41,7 +41,9 @@ FEED_ARCH ?= "${TARGET_ARCH}"
FEED_ARCH_ep93xx = "armv4t"
FEED_ARCH_h6300 = "armv4t"
-FEED_ARCH_fic-gta01 = "armv4t"
+FEED_ARCH_fic-gta01 = "armv4t"
+FEED_ARCH_fic-gta02 = "armv4t"
+FEED_ARCH_fic-hxd8 = "armv4t"
#armv5t machines
@@ -152,7 +154,7 @@ PREFERRED_VERSION_gtk+ = "2.10.14"
# newer poppler cvs breaks some apps, fix until popper 6 and apps
# catch up with api changes
-PREFERRED_VERSION_poppler = "0.5.4"
+# PREFERRED_VERSION_poppler = "0.5.4"
# older gtk-webcore releases don't work on ARM/EABI
# We need to switch to a fixed SRCDATE or release as soon as possible
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index 6e33867aa9..1f46be09d6 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -1,9 +1,11 @@
#-----------------------------------------------------------------------------
#@TYPE: Distribution
-#@NAME: OpenMoKo
-#@DESCRIPTION: Linux Distribution Configuration for the FIC GTA01 Project
+#@NAME: OpenMoko
+#@DESCRIPTION: Linux Distribution Configuration for the OpenMoko Platform
#-----------------------------------------------------------------------------
+require conf/distro/angstrom-2007.1.conf
+
#
# Header
#
@@ -11,18 +13,3 @@ DISTRO_NAME = "OpenMoKo"
DISTRO_VERSION = ".dev-snapshot-${DATE}"
#DISTRO_TYPE = "release"
DISTRO_TYPE = "debug"
-
-require conf/distro/include/openmoko.inc
-
-# Toolchain
-PREFERRED_VERSION_gcc ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
-PREFERRED_VERSION_binutils ?= "2.17.50.0.5"
-PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
-# 2.5 has less bugs, but crashes dropbear :/
-PREFERRED_VERSION_glibc ?= "2.4"
-PREFERRED_VERSION_glibc-intermediate ?= "2.4"
-
-PREFERRED_VERSION_lmsensors-apps ?= "2.10.1"