diff options
author | Ming Liu <liu.ming50@gmail.com> | 2021-05-22 10:14:10 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-25 10:05:19 +0100 |
commit | 0ce91adbbf8d6a0ceb7c736e3e09b31f383215a8 (patch) | |
tree | 834857cfb366b1c84bc191319398fa19ae65681a | |
parent | e7cc8ac2d3e308511d2a10ef5ecd93cab0da6532 (diff) | |
download | poky-0ce91adbbf8d6a0ceb7c736e3e09b31f383215a8.tar.gz |
kernel-fitimage.bbclass: drop unit addresses from bootscr sections
In commit 6047be9f:
[ kernel-fitimage: Don't use unit addresses on FIT ]
It had dropped unit addresses from FIT image but missed on bootscr
part.
Drop unit addresses from bootscr sections in this patch.
(From OE-Core rev: 0ef3a5e2a6d4507c8d9bc6143f9aa65e6cdb1ed7)
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/kernel-fitimage.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index 993e159c75..67cbda4d93 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass | |||
@@ -217,13 +217,13 @@ fitimage_emit_section_boot_script() { | |||
217 | bootscr_sign_keyname="${UBOOT_SIGN_KEYNAME}" | 217 | bootscr_sign_keyname="${UBOOT_SIGN_KEYNAME}" |
218 | 218 | ||
219 | cat << EOF >> ${1} | 219 | cat << EOF >> ${1} |
220 | bootscr@${2} { | 220 | bootscr-${2} { |
221 | description = "U-boot script"; | 221 | description = "U-boot script"; |
222 | data = /incbin/("${3}"); | 222 | data = /incbin/("${3}"); |
223 | type = "script"; | 223 | type = "script"; |
224 | arch = "${UBOOT_ARCH}"; | 224 | arch = "${UBOOT_ARCH}"; |
225 | compression = "none"; | 225 | compression = "none"; |
226 | hash@1 { | 226 | hash-1 { |
227 | algo = "${bootscr_csum}"; | 227 | algo = "${bootscr_csum}"; |
228 | }; | 228 | }; |
229 | }; | 229 | }; |
@@ -232,7 +232,7 @@ EOF | |||
232 | if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "${bootscr_sign_keyname}" ] ; then | 232 | if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "${bootscr_sign_keyname}" ] ; then |
233 | sed -i '$ d' ${1} | 233 | sed -i '$ d' ${1} |
234 | cat << EOF >> ${1} | 234 | cat << EOF >> ${1} |
235 | signature@1 { | 235 | signature-1 { |
236 | algo = "${bootscr_csum},${bootscr_sign_algo}"; | 236 | algo = "${bootscr_csum},${bootscr_sign_algo}"; |
237 | key-name-hint = "${bootscr_sign_keyname}"; | 237 | key-name-hint = "${bootscr_sign_keyname}"; |
238 | }; | 238 | }; |
@@ -383,7 +383,7 @@ fitimage_emit_section_config() { | |||
383 | if [ -n "${bootscr_id}" ]; then | 383 | if [ -n "${bootscr_id}" ]; then |
384 | conf_desc="${conf_desc}${sep}u-boot script" | 384 | conf_desc="${conf_desc}${sep}u-boot script" |
385 | sep=", " | 385 | sep=", " |
386 | bootscr_line="bootscr = \"bootscr@${bootscr_id}\";" | 386 | bootscr_line="bootscr = \"bootscr-${bootscr_id}\";" |
387 | fi | 387 | fi |
388 | 388 | ||
389 | if [ -n "${config_id}" ]; then | 389 | if [ -n "${config_id}" ]; then |