diff options
author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-09 19:19:08 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-09 19:19:08 +0000 |
commit | 45e1048fb2a2fc047c8a903966ca5cc9d1e03112 (patch) | |
tree | 6f5c507ceb9741a5598d2531b980c2f6d7ddf7f0 /conf/machine/tosa.conf | |
parent | edbb148535f63e58a8e10ed5c68b7aecb983602e (diff) | |
parent | ce0af9851e5a2231b9ed9fcfecfd10cc4b7794c3 (diff) |
explicit_merge of '85da89c673cc2faec29d5ea692e6e7638f4c1b5e'
and '5f32961e5d0f4132f4513cbeac7fe59dc5ae5315'
using ancestor ''
to branch 'org.openembedded.dev'
Diffstat (limited to 'conf/machine/tosa.conf')
-rw-r--r-- | conf/machine/tosa.conf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index 20cf6946ae..a4bdba8675 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -6,21 +6,21 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv4 armv5te tosa" KERNEL_VERSION ?= "2.4" -include conf/machine/tosa-${KERNEL_VERSION}.conf +include conf/machine/include/tosa-${KERNEL_VERSION}.conf EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" -BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater" +EXTRA_IMAGEDEPENDS += "zaurus-updater" GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim" ROOT_FLASH_SIZE = "28" -include conf/machine/handheld-common.conf +include conf/machine/include/handheld-common.conf # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf SERIAL_CONSOLE = "115200 ttyS0" |