kernel-fitimage: Make DTB key insertion optional

If UBOOT_DTB_BINARY is empty, then don't try inserting the U-Boot
signing keys into the DTB. In this configuration the keys are expected
to be already present in U-Boot's DTB.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index f84be44bb9e4ea5098044a4e8bc9ff87ef2503a9..db79e9613712f7a4dde0dc2b021bd8e7ac5df2d4 100644 (file)
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -459,7 +459,7 @@ fitimage_assemble() {
                uboot-mkimage \
                        ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
                        -F -k "${UBOOT_SIGN_KEYDIR}" \
-                       -K "${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY}" \
+                       ${@'-K "${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY}"' if len('${UBOOT_DTB_BINARY}') else ''} \
                        -r arch/${ARCH}/boot/${2}
        fi
 }