aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2007-07-27 12:11:56 +0000
committerMichael Lauer <mickey@vanille-media.de>2007-07-27 12:11:56 +0000
commitb83f96f847a2bae76cddb3bea49a8787c9a69e89 (patch)
tree640818ea1a774e3e85c8213949ab38d809466679 /conf
parent3bede78036a8de908532294e594f9a96bf3e2e74 (diff)
parent12e9dd26696aaa5b1ffbc48b8d8eff9afc2c6102 (diff)
downloadopenembedded-b83f96f847a2bae76cddb3bea49a8787c9a69e89.tar.gz
merge of 'af3f6db370a187f22f801a7ed4bdea1061e52e32'
and 'e1ad326dec67a2aaab1bc01b6d70829706bbd6c0'
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/preferred-opie-versions-1.2.3.inc1
-rw-r--r--conf/distro/include/preferred-opie-versions-1.2.4-pre.inc (renamed from conf/distro/include/preferred-opie-versions-1.2.3-pre.inc)6
-rw-r--r--conf/machine/xilinx-ml403.conf6
-rw-r--r--conf/machine/xilinx-ml410.conf22
4 files changed, 30 insertions, 5 deletions
diff --git a/conf/distro/include/preferred-opie-versions-1.2.3.inc b/conf/distro/include/preferred-opie-versions-1.2.3.inc
index 961b12541a..da946d4784 100644
--- a/conf/distro/include/preferred-opie-versions-1.2.3.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.3.inc
@@ -176,6 +176,7 @@ PREFERRED_VERSION_opie-systemtime = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-taskbar-images = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}"
diff --git a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
index 1be35d0dc9..324f4dd80c 100644
--- a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
@@ -3,9 +3,9 @@
QTE_VERSION ?= "2.3.10"
PALMTOP_USE_MULTITHREADED_QT ?= "yes"
-OPIE_SRCDATE ?= "20070724"
-OPIE_VERSION ?= "1.2.2+cvs${OPIE_SRCDATE}"
-OPIE_CVS_PV ?= "1.2.2+cvs${OPIE_SRCDATE}"
+OPIE_SRCDATE ?= "20070727"
+OPIE_VERSION ?= "1.2.3+cvs${OPIE_SRCDATE}"
+OPIE_CVS_PV ?= "1.2.3+cvs${OPIE_SRCDATE}"
#
#
diff --git a/conf/machine/xilinx-ml403.conf b/conf/machine/xilinx-ml403.conf
index 662fb54692..a4979d4527 100644
--- a/conf/machine/xilinx-ml403.conf
+++ b/conf/machine/xilinx-ml403.conf
@@ -1,7 +1,9 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
#@TYPE: Machine
#@Name: Xilinx ML403 FPGA Development Platform
-#@DESCRIPTION: Machine configuration for Xilinx ML403 (softcore ppc) development platform
-\http://www.xilinx.com/xlnx/xebiz/designResources/ip_product_details.jsp?key=HW-V4-ML403-USA&iLanguageID=1
+#@DESCRIPTION: Machine configuration for Xilinx ML403 (softcore ppc) development platform \
+http://www.xilinx.com/ml403
TARGET_ARCH = "powerpc"
PACKAGE_EXTRA_ARCHS = "ppc405"
diff --git a/conf/machine/xilinx-ml410.conf b/conf/machine/xilinx-ml410.conf
new file mode 100644
index 0000000000..9adb26e43e
--- /dev/null
+++ b/conf/machine/xilinx-ml410.conf
@@ -0,0 +1,22 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+#@TYPE: Machine
+#@Name: Xilinx ML410 FPGA Development Platform
+#@DESCRIPTION: Machine configuration for Xilinx ML410 Virtex-4 FX Embedded Development Platform \
+(softcore ppc) development platform http://www.xilinx.com/ml410
+
+TARGET_ARCH = "powerpc"
+PACKAGE_EXTRA_ARCHS = "ppc405"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
+
+MACHINE_FEATURES = "kernel26 ext2"
+
+TARGET_CPU = "405"
+OLDEST_KERNEL = "2.6.12"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+#tune for the 405 cpu
+require conf/machine/include/tune-ppc405.conf
+