<div dir="ltr"><div><div><div>Hi,<br><br></div><span id="gmail-result_box" class="gmail-" tabindex="-1" lang="en"><span>It's done, I just submit the path for the master branch.<br><br></span></span></div><span id="gmail-result_box" class="gmail-" tabindex="-1" lang="en"><span>Best regards,<br></span></span></div><span id="gmail-result_box" class="gmail-" tabindex="-1" lang="en"><span>Thomas P.<br><br></span></span>On Tue, Oct 24, 2017 at 9:38 AM, akuster808 <span dir="ltr"><<a href="mailto:akuster808@gmail.com" target="_blank">akuster808@gmail.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class=""><br>
<br>
On 10/20/2017 02:47 AM, Thomas Perrot wrote:<br>
> - Bad image type replacement for aarch64<br>
> - Fix DTB path in fitimage.its<br>
> - Ignore fitImage type in do_bundle_initramfs task because the packaging is made by do_assemble_fitimage_initramfs<br>
> - the images for arm64 are not compressed the linux_comp variable must therefore be none<br>
><br>
> Signed-off-by: Thomas Perrot <<a href="mailto:thomas.perrot@tupi.fr">thomas.perrot@tupi.fr</a>><br>
> ---<br>
> meta/classes/kernel-fitimage.<wbr>bbclass | 6 +++++-<br>
> meta/classes/kernel-uboot.<wbr>bbclass | 11 ++++++++---<br>
> meta/classes/kernel.bbclass | 4 +++-<br>
</span>I don't see this in master. Please resubmit for Master.<br>
<br>
- armin<br>
<div class="HOEnZb"><div class="h5">> 3 files changed, 16 insertions(+), 5 deletions(-)<br>
><br>
> diff --git a/meta/classes/kernel-<wbr>fitimage.bbclass b/meta/classes/kernel-<wbr>fitimage.bbclass<br>
> index 2630b47316..abbc309b09 100644<br>
> --- a/meta/classes/kernel-<wbr>fitimage.bbclass<br>
> +++ b/meta/classes/kernel-<wbr>fitimage.bbclass<br>
> @@ -7,8 +7,11 @@ python __anonymous () {<br>
> depends = "%s u-boot-mkimage-native dtc-native" % depends<br>
> d.setVar("DEPENDS", depends)<br>
><br>
> - if d.getVar("UBOOT_ARCH") == "x86":<br>
> + uarch = d.getVar("UBOOT_ARCH")<br>
> + if uarch == "x86":<br>
> replacementtype = "bzImage"<br>
> + elif uarch == "arm64":<br>
> + replacementtype = "Image"<br>
> else:<br>
> replacementtype = "zImage"<br>
><br>
> @@ -351,6 +354,7 @@ fitimage_assemble() {<br>
> DTB_PATH="arch/${ARCH}/boot/${<wbr>DTB}"<br>
> fi<br>
><br>
> + DTB=$(echo "${DTB}" | tr '/' '_')<br>
> DTBS="${DTBS} ${DTB}"<br>
> fitimage_emit_section_dtb ${1} ${DTB} ${DTB_PATH}<br>
> done<br>
> diff --git a/meta/classes/kernel-uboot.<wbr>bbclass b/meta/classes/kernel-uboot.<wbr>bbclass<br>
> index 868e97d7a7..940f91d90e 100644<br>
> --- a/meta/classes/kernel-uboot.<wbr>bbclass<br>
> +++ b/meta/classes/kernel-uboot.<wbr>bbclass<br>
> @@ -1,12 +1,17 @@<br>
> uboot_prep_kimage() {<br>
> - if [ -e arch/${ARCH}/boot/compressed/<wbr>vmlinux ]; then<br>
> + if [ -e arch/${ARCH}/boot/compressed/<wbr>vmlinux ] ; then<br>
> vmlinux_path="arch/${ARCH}/<wbr>boot/compressed/vmlinux"<br>
> linux_suffix=""<br>
> linux_comp="none"<br>
> else<br>
> vmlinux_path="vmlinux"<br>
> - linux_suffix=".gz"<br>
> - linux_comp="gzip"<br>
> + if [ "${ARCH}" = "arm64" ] ; then<br>
> + linux_suffix=""<br>
> + linux_comp="none"<br>
> + else<br>
> + linux_suffix=".gz"<br>
> + linux_comp="gzip"<br>
> + fi<br>
> fi<br>
><br>
> ${OBJCOPY} -O binary -R .note -R .comment -S "${vmlinux_path}" linux.bin<br>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass<br>
> index ce2cab65ae..14677ac0fc 100644<br>
> --- a/meta/classes/kernel.bbclass<br>
> +++ b/meta/classes/kernel.bbclass<br>
> @@ -219,7 +219,9 @@ do_bundle_initramfs () {<br>
> # Backing up kernel image relies on its type(regular file or symbolic link)<br>
> tmp_path=""<br>
> for type in ${KERNEL_IMAGETYPES} ; do<br>
> - if [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then<br>
> + if [ "$type" = "fitImage" ] ; then<br>
> + continue<br>
> + elif [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then<br>
> linkpath=`readlink -n ${KERNEL_OUTPUT_DIR}/$type`<br>
> realpath=`readlink -fn ${KERNEL_OUTPUT_DIR}/$type`<br>
> mv -f $realpath $realpath.bak<br>
<br>
</div></div></blockquote></div><br></div></div>