diff options
| author | Robert Schuster <thebohemian@gmx.net> | 2008-07-27 17:44:02 +0000 |
|---|---|---|
| committer | Robert Schuster <thebohemian@gmx.net> | 2008-07-27 17:44:02 +0000 |
| commit | f6df43ad54171f885cbf106f8dfa53ad5b4342f6 (patch) | |
| tree | d206e9fe7ca0b01550f914791bd0c990b2518a54 /conf/machine/include | |
| parent | 1b5a0cc2e6ed2ace27e9281e41ee87073bbf9604 (diff) | |
| parent | 62bbacd3d6c36d909054b02a9709c172fae75076 (diff) | |
merge of '953ae6dd8d43a51ab7e93b1157fbb67ba0c6b42b'
and 'a7a11fde4813257fd795ba98b5cfa99942623f8c'
Diffstat (limited to 'conf/machine/include')
| -rw-r--r-- | conf/machine/include/zaurus-2.6.inc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index c7e6d46872..4bea25a0ed 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -51,7 +51,13 @@ zaurus_make_installkit () { mkdir ${IMAGE_NAME}-installkit/ # Get the latest kernel using the zImage-<machine>.bin symlink - cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage + if [ "${MACHINE}" = "collie" ]; then + [ -f "zImage-${MACHINE}-kexecboot.bin" ] && cp zImage-${MACHINE}-kexecboot.bin ${IMAGE_NAME}-installkit/zImage + # we need also tgz for mmc or cf cards + cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz + else + cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage + fi if [ "${MACHINE}" = "spitz" ]; then cp gnu-tar ${IMAGE_NAME}-installkit/ @@ -72,4 +78,6 @@ zaurus_make_installkit () { # Don't include kernels in standard images for Zaurus machines RDEPENDS_kernel-base = "" +# collie is an exception. We use mmc as root, include kernel and use another small kernel to boot it. +RDEPENDS_kernel-base_collie = "kernel-image" KERNEL_IMAGETYPE = "zImage" |