diff options
author | Paul Eggleton <paul.eggleton@microsoft.com> | 2020-12-16 18:51:37 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-20 00:03:04 +0000 |
commit | ecbf182e8938f45b677e919b3c7a1f73d974cb35 (patch) | |
tree | ffd90c54bb6995226194d462c39664c9a77f43e2 /meta/classes/kernel-fitimage.bbclass | |
parent | 77c3e43fc6cfa484f88b925007a04541abf216f6 (diff) | |
download | poky-ecbf182e8938f45b677e919b3c7a1f73d974cb35.tar.gz |
classes/kernel-fitimage: allow substituting mkimage command
Add a UBOOT_MKIMAGE and UBOOT_MKIMAGE_SIGN variables to allow specifying
an alternative uboot-mkimage executable (or wrapper script/function).
(From OE-Core rev: aee5bac02eff28a75fa1eee646bc511984013aa4)
Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/kernel-fitimage.bbclass')
-rw-r--r-- | meta/classes/kernel-fitimage.bbclass | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index f3d18e22cf..08b5db24b7 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass | |||
@@ -75,6 +75,10 @@ FIT_KEY_SIGN_PKCS ?= "-x509" | |||
75 | # Description string | 75 | # Description string |
76 | FIT_DESC ?= "U-Boot fitImage for ${DISTRO_NAME}/${PV}/${MACHINE}" | 76 | FIT_DESC ?= "U-Boot fitImage for ${DISTRO_NAME}/${PV}/${MACHINE}" |
77 | 77 | ||
78 | # mkimage command | ||
79 | UBOOT_MKIMAGE ?= "uboot-mkimage" | ||
80 | UBOOT_MKIMAGE_SIGN ?= "${UBOOT_MKIMAGE}" | ||
81 | |||
78 | # | 82 | # |
79 | # Emit the fitImage ITS header | 83 | # Emit the fitImage ITS header |
80 | # | 84 | # |
@@ -505,7 +509,7 @@ fitimage_assemble() { | |||
505 | # | 509 | # |
506 | # Step 6: Assemble the image | 510 | # Step 6: Assemble the image |
507 | # | 511 | # |
508 | uboot-mkimage \ | 512 | ${UBOOT_MKIMAGE} \ |
509 | ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \ | 513 | ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \ |
510 | -f ${1} \ | 514 | -f ${1} \ |
511 | arch/${ARCH}/boot/${2} | 515 | arch/${ARCH}/boot/${2} |
@@ -521,7 +525,7 @@ fitimage_assemble() { | |||
521 | cp -P ${STAGING_DATADIR}/u-boot*.dtb ${B} | 525 | cp -P ${STAGING_DATADIR}/u-boot*.dtb ${B} |
522 | add_key_to_u_boot="-K ${B}/${UBOOT_DTB_BINARY}" | 526 | add_key_to_u_boot="-K ${B}/${UBOOT_DTB_BINARY}" |
523 | fi | 527 | fi |
524 | uboot-mkimage \ | 528 | ${UBOOT_MKIMAGE_SIGN} \ |
525 | ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \ | 529 | ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \ |
526 | -F -k "${UBOOT_SIGN_KEYDIR}" \ | 530 | -F -k "${UBOOT_SIGN_KEYDIR}" \ |
527 | $add_key_to_u_boot \ | 531 | $add_key_to_u_boot \ |