summaryrefslogtreecommitdiff
path: root/conf/machine/include/zaurus-2.6.inc
diff options
context:
space:
mode:
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>2008-01-17 09:08:34 +0000
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>2008-01-17 09:08:34 +0000
commite8a60c1e518ddfeb5b5b913c3631b5daa56f6dad (patch)
tree0882c5d7b6bf52ca4d955c3d768124d26268bd0d /conf/machine/include/zaurus-2.6.inc
parent4039f0c65f6b69427d32fff4b2eed3eb90e3baec (diff)
conf/machine: general machine config clean-up for Zaurus as discussed on oe-devel
Diffstat (limited to 'conf/machine/include/zaurus-2.6.inc')
-rw-r--r--conf/machine/include/zaurus-2.6.inc12
1 files changed, 4 insertions, 8 deletions
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index eb020dbcba..a0a71a2969 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -1,8 +1,9 @@
-# Zaurus Clamshell specific configuration for kernel 2.6
-# Don't forget to include zaurus-clamshell.inc as well
+# Zaurus specific configuration for kernel 2.6
+# Additionally, clamshell specific stuff in zaurus-clamshell.inc
TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
+PACKAGE_EXTRA_ARCHS_collie = ""
MACHINE_KERNEL_VERSION = "2.6"
@@ -10,20 +11,15 @@ ERASEBLOCKSIZE = "0x4000"
ERASEBLOCKSIZE_akita = "0x20000"
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n"
-
IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
-
EXTRA_IMAGEDEPENDS += "zaurus-updater"
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.inc
-
SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE_collie = "115200 ttySA0"
PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-
PCMCIA_MANAGER ?= "pcmciautils"
MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat"