zaurus-2.6.inc: fix for KERNEL_IMAGETYPE (and allow uImage)

diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 29f21c4..5ce1cdc 100644 (file)
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -38,6 +38,8 @@ GUI_MACHINE_CLASS_poodle = "smallscreen"
 
 KERNEL_IMAGE_MAXSIZE = "1294336"
 
+KERNEL_IMAGETYPE ?= "zImage"
+
 MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
 
 zaurus_make_installkit () {
@@ -45,13 +47,13 @@ zaurus_make_installkit () {
     rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/         
     mkdir ${IMAGE_NAME}-installkit/
 
-    # Get the latest kernel using the zImage-<machine>.bin symlink
+    # Get the latest kernel using the ${KERNEL_IMAGETYPE}-<machine>.bin symlink
     if [ "${@base_contains('MACHINE_FEATURES', 'kexecboot', 'true', 'false',d)}" = "true" ]; then
-           [ -f "zImage-kexecboot-${MACHINE}.bin" ] && cp zImage-kexecboot-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage
+           [ -f "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin" ] && cp ${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin ${IMAGE_NAME}-installkit/${KERNEL_IMAGETYPE}
            # we need also tgz for mmc or cf cards
            cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/image.tgz
     else
-           cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage
+           cp ${KERNEL_IMAGETYPE}-${MACHINE}.bin ${IMAGE_NAME}-installkit/${KERNEL_IMAGETYPE}
     fi
 
     if [ "${MACHINE}" = "spitz" ]; then
@@ -69,6 +71,4 @@ zaurus_make_installkit () {
     rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/     
 }
 
-KERNEL_IMAGETYPE ?= "zImage"
-
 require conf/machine/include/kexecboot.inc