summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-01-18 12:20:38 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-01-18 12:20:38 +0000
commite7fba8ed9cc84c1c1037e6d4b6daa11c4e6e9287 (patch)
treebefe0c6f5ff49187d4c838171aa6deeda6e75d7e /meta/conf/machine
parent1fa886288e3e4d4d5b08e2fa0b3588b218faa5ae (diff)
downloadpoky-e7fba8ed9cc84c1c1037e6d4b6daa11c4e6e9287.tar.gz
zaurus-2.6: merge OE changes (part1: collie related changes)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3518 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/include/zaurus-2.6.inc11
1 files changed, 4 insertions, 7 deletions
diff --git a/meta/conf/machine/include/zaurus-2.6.inc b/meta/conf/machine/include/zaurus-2.6.inc
index e492fe6e0f..5ac6a50c73 100644
--- a/meta/conf/machine/include/zaurus-2.6.inc
+++ b/meta/conf/machine/include/zaurus-2.6.inc
@@ -1,8 +1,9 @@
1# Zaurus Clamshell specific configuration for kernel 2.6 1# Zaurus specific configuration for kernel 2.6
2# Don't forget to include zaurus-clamshell.inc as well 2# Additionally, clamshell specific stuff in zaurus-clamshell.inc
3 3
4TARGET_ARCH = "arm" 4TARGET_ARCH = "arm"
5PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" 5PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
6PACKAGE_EXTRA_ARCHS_collie = ""
6 7
7MACHINE_KERNEL_VERSION = "2.6" 8MACHINE_KERNEL_VERSION = "2.6"
8 9
@@ -10,15 +11,11 @@ ERASEBLOCKSIZE = "0x4000"
10ERASEBLOCKSIZE_akita = "0x20000" 11ERASEBLOCKSIZE_akita = "0x20000"
11 12
12EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" 13EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n"
13
14IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" 14IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
15
16EXTRA_IMAGEDEPENDS += "zaurus-updater" 15EXTRA_IMAGEDEPENDS += "zaurus-updater"
17 16
18# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
19include conf/machine/include/tune-xscale.inc
20
21SERIAL_CONSOLE = "115200 ttyS0" 17SERIAL_CONSOLE = "115200 ttyS0"
18SERIAL_CONSOLE_collie = "115200 ttySA0"
22 19
23PREFERRED_PROVIDER_virtual/kernel = "linux-rp" 20PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
24PREFERRED_PROVIDER_xserver = "xserver-kdrive" 21PREFERRED_PROVIDER_xserver = "xserver-kdrive"