Currently, do_deploy installs a standard kernel image as an ITB. This
image is linux.bin and it is prepared by uboot_prep_kimage.

The real kernel fit-image is build under arch/${ARCH}/boot/fitImage.

This patch deploys the real fit-image instead of the one prepared by
u-boot and which is included in the ITB.

Note: this patch only concerns fit-images which are not signed by u-boot
or which do not contains initramfs. Only a kernel image with a
device-tree.

Reviewed-by: Denys Dmytriyenko <de...@ti.com>
Signed-off-by: Gaël PORTAY <gael.por...@savoirfairelinux.com>
---
Changes since v1:
 - rebase onto master 83c9405df5748744ef673ac8757bb89d7050ad8d

 meta/classes/kernel-fitimage.bbclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass 
b/meta/classes/kernel-fitimage.bbclass
index 50a91e1990..081a8bfd84 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -461,9 +461,9 @@ kernel_do_deploy_append() {
                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}
-               install -m 0644 linux.bin 
${DEPLOYDIR}/${linux_bin_base_name}.bin
+               
itb_base_name="fitImage-linux.bin-${PV}-${PR}-${MACHINE}-${DATETIME}"
+               itb_symlink_name=fitImage-linux.bin-${MACHINE}
+               install -m 0644 arch/${ARCH}/boot/fitImage 
${DEPLOYDIR}/${itb_base_name}.bin
 
                if [ -n "${INITRAMFS_IMAGE}" ]; then
                        echo "Copying fit-image-${INITRAMFS_IMAGE}.its source 
file..."
@@ -477,7 +477,7 @@ kernel_do_deploy_append() {
 
                cd ${DEPLOYDIR}
                ln -sf ${its_base_name}.its ${its_symlink_name}.its
-               ln -sf ${linux_bin_base_name}.bin ${linux_bin_symlink_name}.bin
+               ln -sf ${itb_base_name}.bin ${itb_symlink_name}.bin
 
                if [ -n "${INITRAMFS_IMAGE}" ]; then
                        ln -sf ${its_initramfs_base_name}.its 
${its_initramfs_symlink_name}.its
-- 
2.17.1

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to