diff options
author | Jun Nie <jun.nie@linaro.org> | 2019-07-10 15:10:56 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-30 16:44:42 +0100 |
commit | 56d33a456b657a02193967ecdd4a287561d93cf3 (patch) | |
tree | 1ffb1620b85c3709eac44612b9198602b31ace73 /meta/classes | |
parent | feb1ac93fd928137e62e4ca09d7e157e2495526d (diff) | |
download | poky-56d33a456b657a02193967ecdd4a287561d93cf3.tar.gz |
kernel-fitimage: uboot-sign: fix missing signature
u-boot.bin with dtb & signature should be placed in ${B} so that
it can be deployed by u-boot as expected. Otherwise, the version
without signature is installed.
(From OE-Core rev: 6b4c4fbaef8b4655efbc542fb7b97081dbaed8ce)
Signed-off-by: Jun Nie <jun.nie@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/uboot-sign.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass index 8beafff7c0..1fc2a37214 100644 --- a/meta/classes/uboot-sign.bbclass +++ b/meta/classes/uboot-sign.bbclass | |||
@@ -66,7 +66,7 @@ concat_dtb_helper() { | |||
66 | install ${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} | 66 | install ${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} |
67 | elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e "$deployed_uboot_dtb_binary" ]; then | 67 | elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e "$deployed_uboot_dtb_binary" ]; then |
68 | cd ${DEPLOYDIR} | 68 | cd ${DEPLOYDIR} |
69 | cat ${UBOOT_NODTB_IMAGE} $deployed_uboot_dtb_binary | tee ${UBOOT_BINARY} > ${UBOOT_IMAGE} | 69 | cat ${UBOOT_NODTB_IMAGE} $deployed_uboot_dtb_binary | tee ${B}/${CONFIG_B_PATH}/${UBOOT_BINARY} > ${UBOOT_IMAGE} |
70 | else | 70 | else |
71 | bbwarn "Failure while adding public key to u-boot binary. Verified boot won't be available." | 71 | bbwarn "Failure while adding public key to u-boot binary. Verified boot won't be available." |
72 | fi | 72 | fi |
@@ -77,10 +77,12 @@ concat_dtb() { | |||
77 | mkdir -p ${DEPLOYDIR} | 77 | mkdir -p ${DEPLOYDIR} |
78 | if [ -n "${UBOOT_CONFIG}" ]; then | 78 | if [ -n "${UBOOT_CONFIG}" ]; then |
79 | for config in ${UBOOT_MACHINE}; do | 79 | for config in ${UBOOT_MACHINE}; do |
80 | CONFIG_B_PATH="${config}" | ||
80 | cd ${B}/${config} | 81 | cd ${B}/${config} |
81 | concat_dtb_helper | 82 | concat_dtb_helper |
82 | done | 83 | done |
83 | else | 84 | else |
85 | CONFIG_B_PATH="" | ||
84 | cd ${B} | 86 | cd ${B} |
85 | concat_dtb_helper | 87 | concat_dtb_helper |
86 | fi | 88 | fi |