diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-01-18 12:20:38 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-01-18 12:20:38 +0000 |
| commit | e7fba8ed9cc84c1c1037e6d4b6daa11c4e6e9287 (patch) | |
| tree | befe0c6f5ff49187d4c838171aa6deeda6e75d7e | |
| parent | 1fa886288e3e4d4d5b08e2fa0b3588b218faa5ae (diff) | |
| download | openembedded-core-e7fba8ed9cc84c1c1037e6d4b6daa11c4e6e9287.tar.gz openembedded-core-e7fba8ed9cc84c1c1037e6d4b6daa11c4e6e9287.tar.bz2 openembedded-core-e7fba8ed9cc84c1c1037e6d4b6daa11c4e6e9287.zip | |
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
| -rw-r--r-- | meta/conf/machine/include/zaurus-2.6.inc | 11 |
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 @@ -# 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,15 +11,11 @@ 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_xserver = "xserver-kdrive" |