summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-11-07 08:23:49 +0000
committerKoen Kooi <koen@openembedded.org>2007-11-07 08:23:49 +0000
commit8c1a5e33bf439c0274b795cc580a30c5de951df7 (patch)
tree1e9abcaa7335e11358122ebcd10f9b63ac2dd65b /conf
parent6a90f2b29e36ae3a730bd2640d856e46f82b0e30 (diff)
parent830e2d4461c53e67c96e711e7adb9d03a69b3b65 (diff)
propagate from branch 'org.openembedded.dev' (head 85dec2124d884510a593355cc3c8e6072d815aa8)
to branch 'org.openembedded.dev.avr32' (head 3bb11549cc2f7740a5512dd35c3e391d67893868)
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/angstrom-2007.1.conf8
-rw-r--r--conf/distro/include/insane-srcrevs.inc1
-rw-r--r--conf/distro/include/sane-srcrevs.inc1
-rw-r--r--conf/machine/mpc8323e-rdb.conf6
-rw-r--r--conf/machine/vmware.conf25
5 files changed, 37 insertions, 4 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 831ab8b0ee..93774d1d47 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -86,6 +86,12 @@ PREFERRED_VERSION_gcc-cross_dht-walnut ?= "4.1.1"
PREFERRED_VERSION_gcc-cross-sdk_dht-walnut ?= "4.1.1"
PREFERRED_VERSION_gcc-cross-initial_dht-walnut ?= "4.1.1"
+
+PREFERRED_VERSION_gcc_mpc8323e-rdb ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross_mpc8323e-rdb ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-sdk_mpc8323e-rdb ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial_mpc8323e-rdb ?= "4.1.1"
+
PREFERRED_VERSION_binutils ?= "2.18"
PREFERRED_VERSION_binutils-cross ?= "2.18"
PREFERRED_VERSION_binutils-cross-sdk ?= "2.18"
@@ -112,10 +118,10 @@ PREFERRED_VERSION_glibc-initial ?= "2.5"
# PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3"
#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
+require conf/distro/include/preferred-xorg-versions.inc
require conf/distro/include/angstrom-2007-preferred-versions.inc
require conf/distro/include/preferred-gpe-versions-2.8.inc
require conf/distro/include/preferred-e-versions.inc
-require conf/distro/include/preferred-xorg-versions.inc
# Virtuals:
diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc
index b085a44261..7c675087ab 100644
--- a/conf/distro/include/insane-srcrevs.inc
+++ b/conf/distro/include/insane-srcrevs.inc
@@ -1,6 +1,7 @@
SRCREV_pn-aircrack-ng ?= "${AUTOREV}"
SRCREV_pn-dfu-util ?= "${AUTOREV}"
SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
+SRCREV_pn-eds-dbus ?= "${AUTOREV}"
SRCREV_pn-eglibc ?= "${AUTOREV}"
SRCREV_pn-eglibc-initial ?= "${AUTOREV}"
SRCREV_pn-eglibc-intermediate ?= "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index e79abfd1ce..7c42165401 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -13,6 +13,7 @@ SRCREV_pn-dbus-c++-native ?= "13131"
SRCREV_pn-dbus-c++ ?= "13131"
SRCREV_pn-dfu-util ?= "2866"
SRCREV_pn-dfu-util-native ?= "2866"
+SRCREV_pn-eds-dbus ?= "628"
SRCREV_pn-eglibc ?= "3531"
SRCREV_pn-eglibc-initial ?= "3531"
SRCREV_pn-eglibc-intermediate ?= "3531"
diff --git a/conf/machine/mpc8323e-rdb.conf b/conf/machine/mpc8323e-rdb.conf
index a6b29552c5..0c0e07174a 100644
--- a/conf/machine/mpc8323e-rdb.conf
+++ b/conf/machine/mpc8323e-rdb.conf
@@ -3,14 +3,14 @@
#@DESCRIPTION: Machine configuration for the Freescale MPC8323E-RDB
TARGET_ARCH = "powerpc"
-TARGET_FPU = "soft"
+#TARGET_FPU = "soft"
PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppce300c2"
PREFERRED_PROVIDER_virtual/kernel = "linux"
-MACHINE_FEATURES = "kernel26 usbhost ext2"
+MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot"
-PREFERRED_VERSION_u-boot = "git"
+PREFERRED_VERSION_u-boot = "1.1.6"
UBOOT_MACHINE = "MPC8323ERDB_config"
EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000"
diff --git a/conf/machine/vmware.conf b/conf/machine/vmware.conf
new file mode 100644
index 0000000000..4822c389a1
--- /dev/null
+++ b/conf/machine/vmware.conf
@@ -0,0 +1,25 @@
+# Copyright (C) 2007, Florian Boor - based on x86.conf:
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+#@TYPE: Machine
+#@NAME: VMWare
+#@DESCRIPTION: Machine configuration for a VMWare virtual PC
+
+TARGET_ARCH = "i686"
+PACKAGE_EXTRA_ARCHS = "vmware"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER="xserver-kdrive-vesa"
+
+KERNEL_IMAGETYPE = "bzImage"
+
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen x86"
+
+udevdir = "/dev"
+OLDEST_KERNEL = "2.6.17"
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+require conf/machine/include/pentiumpro.inc