summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorGeorge McCollister <george.mccollister@gmail.com>2016-05-26 12:27:56 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-30 15:58:15 +0100
commitb426b2bc1a954e05e5fcbc40e6ff39251075305d (patch)
tree9f3ff9390959332c9bc7d2e87393277c18a1c10c /meta
parent8d7f58bac1fe528d2a8d442073398336d4fdbc22 (diff)
downloadpoky-b426b2bc1a954e05e5fcbc40e6ff39251075305d.tar.gz
uboot-sign: rebuild u-boot.img with signed dtb
u-boot-nodtb.img doesn't exist so if UBOOT_SUFFIX = "img" is used u-boot.img must be rebuilt by running make with EXT_DTB=${DEPLOYDIR}/${UBOOT_DTB_IMAGE} then the resulting .img file must be install to the deploy directories. (From OE-Core rev: 4afee787e455ce1d4c002cd5c003182f1fc50028) Signed-off-by: George McCollister <george.mccollister@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/uboot-sign.bbclass8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass
index 82cec9e3a6..57d49039a9 100644
--- a/meta/classes/uboot-sign.bbclass
+++ b/meta/classes/uboot-sign.bbclass
@@ -63,9 +63,13 @@ do_deploy_dtb () {
63do_concat_dtb () { 63do_concat_dtb () {
64 # Concatenate U-Boot w/o DTB & DTB with public key 64 # Concatenate U-Boot w/o DTB & DTB with public key
65 # (cf. kernel-fitimage.bbclass for more details) 65 # (cf. kernel-fitimage.bbclass for more details)
66 cd ${DEPLOYDIR}
67 if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ]; then 66 if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ]; then
68 if [ -e "${UBOOT_NODTB_IMAGE}" -a -e "${UBOOT_DTB_IMAGE}" ]; then 67 if [ "x${UBOOT_SUFFIX}" = "ximg" -a -e "${DEPLOYDIR}/${UBOOT_DTB_IMAGE}" ]; then
68 oe_runmake EXT_DTB=${DEPLOYDIR}/${UBOOT_DTB_IMAGE}
69 install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
70 install ${S}/${UBOOT_BINARY} ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
71 elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e "${DEPLOYDIR}/${UBOOT_DTB_IMAGE}" ]; then
72 cd ${DEPLOYDIR}
69 cat ${UBOOT_NODTB_IMAGE} ${UBOOT_DTB_IMAGE} | tee ${B}/${UBOOT_BINARY} > ${UBOOT_IMAGE} 73 cat ${UBOOT_NODTB_IMAGE} ${UBOOT_DTB_IMAGE} | tee ${B}/${UBOOT_BINARY} > ${UBOOT_IMAGE}
70 else 74 else
71 bbwarn "Failure while adding public key to u-boot binary. Verified boot won't be available." 75 bbwarn "Failure while adding public key to u-boot binary. Verified boot won't be available."