diff options
| author | Andrea Adami <andrea.adami@gmail.com> | 2009-03-29 22:58:53 +0200 |
|---|---|---|
| committer | Andrea Adami <andrea.adami@gmail.com> | 2009-03-29 22:58:53 +0200 |
| commit | acc50bd8c1c2f5930c318fe2dcae85b2e6d715f2 (patch) | |
| tree | 56b4fd93f019d996b96a4662421bbd3540819fc6 /conf/machine/include | |
| parent | 777c140275473577d6df8c7f54298bcc8a5abfa9 (diff) | |
zaurus-2.6.inc: fix for KERNEL_IMAGETYPE (and allow uImage)
Diffstat (limited to 'conf/machine/include')
| -rw-r--r-- | conf/machine/include/zaurus-2.6.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 29f21c4f56..5ce1cdca6a 100644 --- 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 |