kernel-fitimage: Use KERNEL_OUTPUT_DIR where appropriate

We have a specific variable for the path to the boot directory. Use it
instead of open-coding this path.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/meta/classes-recipe/kernel-fitimage.bbclass b/meta/classes-recipe/kernel-fitimage.bbclass
index 107914e28cfba8dd85aed6f5a8c28f0d87be5fa6..8ddebf8dd878a0557ec71d674c6552032a148de7 100644 (file)
--- a/meta/classes-recipe/kernel-fitimage.bbclass
+++ b/meta/classes-recipe/kernel-fitimage.bbclass
@@ -496,7 +496,7 @@ fitimage_assemble() {
        ramdiskcount=$3
        setupcount=""
        bootscr_id=""
-       rm -f $1 arch/${ARCH}/boot/$2
+       rm -f $1 ${KERNEL_OUTPUT_DIR}/$2
 
        if [ -n "${UBOOT_SIGN_IMG_KEYNAME}" -a "${UBOOT_SIGN_KEYNAME}" = "${UBOOT_SIGN_IMG_KEYNAME}" ]; then
                bbfatal "Keys used to sign images and configuration nodes must be different."
@@ -529,9 +529,9 @@ fitimage_assemble() {
                                continue
                        fi
 
-                       DTB_PATH="arch/${ARCH}/boot/dts/$DTB"
+                       DTB_PATH="${KERNEL_OUTPUT_DIR}/dts/$DTB"
                        if [ ! -e "$DTB_PATH" ]; then
-                               DTB_PATH="arch/${ARCH}/boot/$DTB"
+                               DTB_PATH="${KERNEL_OUTPUT_DIR}/$DTB"
                        fi
 
                        DTB=$(echo "$DTB" | tr '/' '_')
@@ -574,9 +574,9 @@ fitimage_assemble() {
        #
        # Step 4: Prepare a setup section. (For x86)
        #
-       if [ -e arch/${ARCH}/boot/setup.bin ]; then
+       if [ -e ${KERNEL_OUTPUT_DIR}/setup.bin ]; then
                setupcount=1
-               fitimage_emit_section_setup $1 $setupcount arch/${ARCH}/boot/setup.bin
+               fitimage_emit_section_setup $1 $setupcount ${KERNEL_OUTPUT_DIR}/setup.bin
        fi
 
        #
@@ -650,7 +650,7 @@ fitimage_assemble() {
        ${UBOOT_MKIMAGE} \
                ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
                -f $1 \
-               arch/${ARCH}/boot/$2
+               ${KERNEL_OUTPUT_DIR}/$2
 
        #
        # Step 8: Sign the image and add public key to U-Boot dtb
@@ -667,7 +667,7 @@ fitimage_assemble() {
                        ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
                        -F -k "${UBOOT_SIGN_KEYDIR}" \
                        $add_key_to_u_boot \
-                       -r arch/${ARCH}/boot/$2 \
+                       -r ${KERNEL_OUTPUT_DIR}/$2 \
                        ${UBOOT_MKIMAGE_SIGN_ARGS}
        fi
 }
@@ -770,7 +770,7 @@ kernel_do_deploy:append() {
 
                        if [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then
                                bbnote "Copying fitImage-${INITRAMFS_IMAGE} file..."
-                               install -m 0644 ${B}/arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT}"
+                               install -m 0644 ${B}/${KERNEL_OUTPUT_DIR}/fitImage-${INITRAMFS_IMAGE} "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT}"
                                if [ -n "${KERNEL_FIT_LINK_NAME}" ] ; then
                                        ln -snf fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT} "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME}"
                                fi