Revert "kernel.bbclass: do not deploy fitImage; kernel-fitimage.bbclass does that."

This reverts commit 65cded55fa96b1ba72149a31689c081ac27af7f7.

The fitImage deployed here is the one generated in kernel-fitimage.bbclass,
whereas the one deployed by kernel-fitimage.bbclass is a raw image, so we
need the one deployed here keeping.

(From OE-Core rev: 798d2acc0141b13da7ddd18875a417b2df9d57b3)

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 6 insertions, 12 deletions

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index bfb4243969..6b734be2b6 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -667,11 +667,8 @@ kernel_do_deploy() {
         fi
 
         for imageType in ${KERNEL_IMAGETYPES} ; do
-                # kernel-fitimage class deploys fitImages, skip here
-                if [ "$imageType" != "fitImage" ]; then
-                        base_name=${imageType}-${KERNEL_IMAGE_NAME}
-                        install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} $deployDir/${base_name}.bin
-                fi
+                base_name=${imageType}-${KERNEL_IMAGE_NAME}
+                install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} $deployDir/${base_name}.bin
         done
         if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
                 mkdir -p ${D}/lib
@@ -688,13 +685,10 @@ kernel_do_deploy() {
 
         if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
                 for imageType in ${KERNEL_IMAGETYPES} ; do
-                        # kernel-fitimage class deploys fitImages, skip here
-                        if [ "$imageType" != "fitImage" ]; then
-                                initramfs_base_name=${imageType}-${INITRAMFS_NAME}
-                                initramfs_symlink_name=${imageType}-${INITRAMFS_LINK_NAME}
-                                install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType}.initramfs $deployDir/${initramfs_base_name}.bin
-                                ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin
-                        fi
+                        initramfs_base_name=${imageType}-${INITRAMFS_NAME}
+                        initramfs_symlink_name=${imageType}-${INITRAMFS_LINK_NAME}
+                        install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType}.initramfs $deployDir/${initramfs_base_name}.bin
+                        ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin
                 done
         fi
 }