summaryrefslogtreecommitdiffstats
path: root/meta/classes/uboot-sign.bbclass
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2018-12-12 20:18:46 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-11 10:39:09 +0000
commit1c0473fe4b192fcb6a2d78e9e8772a3a1c7574c7 (patch)
tree94ba78c199d51ca77f1439ad1c7da12a7ab36633 /meta/classes/uboot-sign.bbclass
parent24d8aa6ec2d439c35a217bc3d021b37e0ddcdd8d (diff)
downloadpoky-1c0473fe4b192fcb6a2d78e9e8772a3a1c7574c7.tar.gz
uboot-sign.bbclass: silence warnings when UBOOT_DTB_BINARY is empty
When UBOOT_DTB_BINARY is set to "", the keys for signed booting are expected to be already present in U-Boot's DTB, so don't issue warnings for this. (From OE-Core rev: 04656f5df326a72747fc5878ce201b636a2a419c) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/uboot-sign.bbclass')
-rw-r--r--meta/classes/uboot-sign.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass
index 03100b8a5f..9e3d1d6fc1 100644
--- a/meta/classes/uboot-sign.bbclass
+++ b/meta/classes/uboot-sign.bbclass
@@ -70,7 +70,7 @@ concat_dtb() {
70 elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e "$deployed_uboot_dtb_binary" ]; then 70 elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e "$deployed_uboot_dtb_binary" ]; then
71 cd ${DEPLOYDIR} 71 cd ${DEPLOYDIR}
72 cat ${UBOOT_NODTB_IMAGE} $deployed_uboot_dtb_binary | tee ${B}/${UBOOT_BINARY} > ${UBOOT_IMAGE} 72 cat ${UBOOT_NODTB_IMAGE} $deployed_uboot_dtb_binary | tee ${B}/${UBOOT_BINARY} > ${UBOOT_IMAGE}
73 else 73 elif [ -n "${UBOOT_DTB_BINARY}" ]; then
74 bbwarn "Failure while adding public key to u-boot binary. Verified boot won't be available." 74 bbwarn "Failure while adding public key to u-boot binary. Verified boot won't be available."
75 fi 75 fi
76 fi 76 fi
@@ -86,7 +86,7 @@ do_install_append() {
86 # need both of them. 86 # need both of them.
87 install ${B}/${UBOOT_DTB_BINARY} ${D}${datadir}/${UBOOT_DTB_IMAGE} 87 install ${B}/${UBOOT_DTB_BINARY} ${D}${datadir}/${UBOOT_DTB_IMAGE}
88 ln -sf ${UBOOT_DTB_IMAGE} ${D}${datadir}/${UBOOT_DTB_BINARY} 88 ln -sf ${UBOOT_DTB_IMAGE} ${D}${datadir}/${UBOOT_DTB_BINARY}
89 else 89 elif [ -n "${UBOOT_DTB_BINARY}" ]; then
90 bbwarn "${B}/${UBOOT_DTB_BINARY} not found" 90 bbwarn "${B}/${UBOOT_DTB_BINARY} not found"
91 fi 91 fi
92 fi 92 fi