kernel-itbimage: itbimage instead of fitimage

*Using one unified name to its and image bin

Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
Signed-off-by: Chunrong Guo <chunrong.guo@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/classes/kernel-itbimage.bbclass b/classes/kernel-itbimage.bbclass
index 6658d91ff63fa6cddf50e5591ad093e8fe8d5819..bb838ef1979e679e1ea9b971d68517fac73de7ee 100644 (file)
--- a/classes/kernel-itbimage.bbclass
+++ b/classes/kernel-itbimage.bbclass
@@ -429,7 +429,7 @@ fitimage_assemble() {
 do_assemble_fitimage() {
        if echo ${KERNEL_IMAGETYPES} | grep -wq "itbImage"; then
                cd ${B}
-               fitimage_assemble fit-image.its itbImage
+               fitimage_assemble itb-image.its itbImage
        fi
 }
 
@@ -439,7 +439,7 @@ do_assemble_fitimage_initramfs() {
        if echo ${KERNEL_IMAGETYPES} | grep -wq "itbImage" && \
                test -n "${INITRAMFS_IMAGE}" ; then
                cd ${B}
-               fitimage_assemble fit-image-${INITRAMFS_IMAGE}.its fitImage-${INITRAMFS_IMAGE} 1
+               fitimage_assemble itb-image-${INITRAMFS_IMAGE}.its itbImage-${INITRAMFS_IMAGE} 1
        fi
 }
 
@@ -452,21 +452,21 @@ kernel_do_deploy_append() {
        if echo ${KERNEL_IMAGETYPES} | grep -wq "itbImage"; then
                cd ${B}
                echo "Copying fit-image.its source file..."
-               its_base_name="fitImage-its-${PV}-${PR}-${MACHINE}-${DATETIME}"
-               its_symlink_name=fitImage-its-${MACHINE}
-               install -m 0644 fit-image.its ${DEPLOYDIR}/${its_base_name}.its
-               linux_bin_base_name="fitImage-linux.bin-${PV}-${PR}-${MACHINE}-${DATETIME}"
-               linux_bin_symlink_name=fitImage-linux.bin-${MACHINE}
+               its_base_name="itbImage-its-${PV}-${PR}-${MACHINE}-${DATETIME}"
+               its_symlink_name=itbImage-its-${MACHINE}
+               install -m 0644 itb-image.its ${DEPLOYDIR}/${its_base_name}.its
+               linux_bin_base_name="itbImage-linux.bin-${PV}-${PR}-${MACHINE}-${DATETIME}"
+               linux_bin_symlink_name=itbImage-linux.bin-${MACHINE}
                install -m 0644 linux.bin ${DEPLOYDIR}/${linux_bin_base_name}.bin
 
                if [ -n "${INITRAMFS_IMAGE}" ]; then
                        echo "Copying fit-image-${INITRAMFS_IMAGE}.its source file..."
-                       its_initramfs_base_name="fitImage-its-${INITRAMFS_IMAGE_NAME}-${PV}-${PR}-${DATETIME}"
-                       its_initramfs_symlink_name=fitImage-its-${INITRAMFS_IMAGE_NAME}
-                       install -m 0644 fit-image-${INITRAMFS_IMAGE}.its ${DEPLOYDIR}/${its_initramfs_base_name}.its
-                       fit_initramfs_base_name="fitImage-${INITRAMFS_IMAGE_NAME}-${PV}-${PR}-${DATETIME}"
-                       fit_initramfs_symlink_name=fitImage-${INITRAMFS_IMAGE_NAME}
-                       install -m 0644 arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} ${DEPLOYDIR}/${fit_initramfs_base_name}.bin
+                       its_initramfs_base_name="itbImage-its-${INITRAMFS_IMAGE_NAME}-${PV}-${PR}-${DATETIME}"
+                       its_initramfs_symlink_name=itbImage-its-${INITRAMFS_IMAGE_NAME}
+                       install -m 0644 itb-image-${INITRAMFS_IMAGE}.its ${DEPLOYDIR}/${its_initramfs_base_name}.its
+                       fit_initramfs_base_name="itbImage-${INITRAMFS_IMAGE_NAME}-${PV}-${PR}-${DATETIME}"
+                       fit_initramfs_symlink_name=itbImage-${INITRAMFS_IMAGE_NAME}
+                       install -m 0644 arch/${ARCH}/boot/itbImage-${INITRAMFS_IMAGE} ${DEPLOYDIR}/${fit_initramfs_base_name}.bin
                fi
 
                cd ${DEPLOYDIR}