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

diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 5170f89..3914184 100644 (file)
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -8,11 +8,19 @@ MACHINE_KERNEL_VERSION ?= "2.6"
 require conf/machine/include/zaurus-${MACHINE_KERNEL_VERSION}.inc
 require conf/machine/include/tune-strongarm.inc
 
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
 
-EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
-IMAGE_LINGUAS = ""
+EXTRA_IMAGECMD_jffs2 ?= "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
+IMAGE_LINGUAS ?= ""
 IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
 ROOT_FLASH_SIZE = "14"
 # actually 14680064, see EXTRA_IMAGECMD above
+
+# we store kernel images in rootfs and only a minimal initramfs kernel in mtd1 for booting other kernels
+DONT_CHECK_KERNELSIZE ?= "1"
+
+IMAGE_DEVICE_TABLES ?= "files/device_table-minimal.txt \
+                       files/device_table_add-mmc.txt"
+
+XSERVER ?= "xserver-kdrive-fbdev"

diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index c7e6d46..4bea25a 100644 (file)
--- 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"