[oe-commits] org.oe.dev collie.conf: -make collie also use device-table with mmc added

[thesing commit]

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

Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: 35d00516005b1f33ef42cecb0350a20a51723706
ViewMTN: http://monotone.openembedded.org/revision/info/35d00516005b1f33ef42cecb0350a20a51723706
Files:
1
conf/machine/collie.conf
conf/machine/include/zaurus-2.6.inc
Diffs:

#
# mt diff -r778f5060c8efad1b1a5b68d3eb075ce7272e5ab7 -r35d00516005b1f33ef42cecb0350a20a51723706
#
#
#
# patch "conf/machine/collie.conf"
#  from [c23a85835bc13ac978f36742cfc8ccf5880e0ec8]
#    to [334ab4b53eea3f3be4a7b39b8fac9412b650aef2]
# 
# patch "conf/machine/include/zaurus-2.6.inc"
#  from [f56c5d7f00ad90430d1cfa3e9ff6283245f5e5c6]
#    to [8294b7a8b586a8481132e82ee1e468c413001cb9]
#
============================================================
--- conf/machine/collie.conf	c23a85835bc13ac978f36742cfc8ccf5880e0ec8
+++ conf/machine/collie.conf	334ab4b53eea3f3be4a7b39b8fac9412b650aef2
@@ -8,11 +8,19 @@ require conf/machine/include/tune-strong
 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"
============================================================
--- conf/machine/include/zaurus-2.6.inc	f56c5d7f00ad90430d1cfa3e9ff6283245f5e5c6
+++ conf/machine/include/zaurus-2.6.inc	8294b7a8b586a8481132e82ee1e468c413001cb9
@@ -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 @@ RDEPENDS_kernel-base = ""
 
 # 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"