From be5fab607dec7bf7f9c69208cdc2ff98ef354357 Mon Sep 17 00:00:00 2001 From: Thomas Kunze Date: Sun, 27 Jul 2008 15:04:16 +0000 Subject: collie.conf: -make collie also use device-table with mmc added -collie kernels are not checked for size now -other minor stuff zaurus-2.6.inc: -add kernel to rootfs for collie -change do_installkit accordingly --- conf/machine/include/zaurus-2.6.inc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'conf/machine/include') 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-.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" -- cgit v1.2.3