diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-09 19:21:24 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-09 19:21:24 +0000 |
| commit | 86d1d8cd13335c4dca722ac398c69a105fc9ac8f (patch) | |
| tree | bf7433f99e0fc0ffbdbddd24c2201d21a9dd60e8 /conf/machine/poodle.conf | |
| parent | 249a5476b2d2ec15e71b126bb02bc885b29604ee (diff) | |
| parent | 45e1048fb2a2fc047c8a903966ca5cc9d1e03112 (diff) | |
explicit_merge of '93b8d4a095a60dfe2b4b6e82f4ce68721a1d4f11'
and 'd5130c6d17c31fa91dee51b0074c7e5e8c87717c'
using ancestor ''
to branch 'org.openembedded.dev'
Diffstat (limited to 'conf/machine/poodle.conf')
| -rw-r--r-- | conf/machine/poodle.conf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index 8b33912835..a1bf5fbec3 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -6,20 +6,20 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv4 armv5te poodle" KERNEL_VERSION ?= "2.4" -include conf/machine/poodle-${KERNEL_VERSION}.conf +include conf/machine/include/poodle-${KERNEL_VERSION}.conf EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}" -BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater" +EXTRA_IMAGEDEPENDS += "zaurus-updater" -include conf/machine/handheld-common.conf +include conf/machine/include/handheld-common.conf ROOT_FLASH_SIZE = "22" # 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" |