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/spitz.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/spitz.conf')
| -rw-r--r-- | conf/machine/spitz.conf | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 2b22680554..e1cb468d8f 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -4,15 +4,13 @@ KERNEL_VERSION ?= "2.6" -include conf/machine/zaurus-clamshell.conf -include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf +include conf/machine/include/zaurus-clamshell.conf +include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf -PIVOTBOOT_EXTRA_DEPENDS += "pivotinit pcmcia-cs" PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs" PIVOTBOOT_EXTRA_RRECOMMENDS += "" # Useful things for the built-in Harddisk -BOOTSTRAP_EXTRA_DEPENDS += "hdparm e2fsprogs" BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs" IMAGE_FSTYPES = "jffs2 tar.gz" @@ -20,4 +18,3 @@ IMAGE_FSTYPES = "jffs2 tar.gz" ROOT_FLASH_SIZE = "100" # actually that should really read ROOTFS_SIZE = "100", because with modern kernels, # we boot from the built-in harddisk in C3000. ROOT_FLASH_SIZE is really 5 MegaByte - |