From: Alex Kiernan <alex.kiernan@gmail.com>
Date: Wed, 20 Jun 2018 04:23:19 +0000 (+0000)
Subject: kernel-fitimage: Make DTB key insertion optional
X-Git-Tag: uninative-2.2~217
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=a0d74767f7bd18c853df6b0be162363076d8f965;p=openembedded-core.git

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 f84be44bb9..db79e96137 100644
--- 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
 }