image_types_fsl.bbclass: Add support for kernel image types

Use the KERNEL_IMAGETYPE variable, making the class configurable for all
supported kernel image types.

This patch is tested with a 3rd-party board and a sabrelite board.

Signed-off-by: S. Fricke <sfricke@data-modul.com>

diff --git a/meta-fsl-arm/classes/image_types_fsl.bbclass b/meta-fsl-arm/classes/image_types_fsl.bbclass
index b803aef79c4fbb9abe78e3cebd3ab12f760960ad..b894495b966b083444014ff55da27124d0178ffd 100644 (file)
--- a/meta-fsl-arm/classes/image_types_fsl.bbclass
+++ b/meta-fsl-arm/classes/image_types_fsl.bbclass
@@ -118,7 +118,7 @@ generate_imx_sdcard () {
        BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDCARD} unit b print \
                          | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 1024 }')
        mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
-       mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE}.bin ::/uImage
+       mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::/${KERNEL_IMAGETYPE}
 
        # Copy boot scripts
        for item in ${BOOT_SCRIPTS}; do
@@ -221,7 +221,7 @@ generate_mxs_sdcard () {
                | awk '/ 2 / { print substr($4, 1, length($4 -1)) / 1024 }')
 
                mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
-               mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE}.bin ::/uImage
+               mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::/${KERNEL_IMAGETYPE}
                if test -n "${KERNEL_DEVICETREE}"; then
                        for DTS_FILE in ${KERNEL_DEVICETREE}; do
                                DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`