mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

kernel-fitimage.bbclass: drop unit addresses from bootscr sections

Browse Source 
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>
This commit is contained in:
Ming Liu
2021-05-22 10:14:10 +02:00
committed by Richard Purdie
parent e7cc8ac2d3
commit 0ce91adbbf
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/kernel-fitimage.bbclass
+4 -4
View File
@@ -217,13 +217,13 @@ fitimage_emit_section_boot_script() {
bootscr_sign_keyname="${UBOOT_SIGN_KEYNAME}" bootscr_sign_keyname="${UBOOT_SIGN_KEYNAME}"
cat << EOF >> ${1} cat << EOF >> ${1}
bootscr@${2} { bootscr-${2} {
description = "U-boot script"; description = "U-boot script";
data = /incbin/("${3}"); data = /incbin/("${3}");
type = "script"; type = "script";
arch = "${UBOOT_ARCH}"; arch = "${UBOOT_ARCH}";
compression = "none"; compression = "none";
hash@1 { hash-1 {
algo = "${bootscr_csum}"; algo = "${bootscr_csum}";
}; };
}; };
@@ -232,7 +232,7 @@ EOF
if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "${bootscr_sign_keyname}" ] ; then if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "${bootscr_sign_keyname}" ] ; then
sed -i '$ d' ${1} sed -i '$ d' ${1}
cat << EOF >> ${1} cat << EOF >> ${1}
signature@1 { signature-1 {
algo = "${bootscr_csum},${bootscr_sign_algo}"; algo = "${bootscr_csum},${bootscr_sign_algo}";
key-name-hint = "${bootscr_sign_keyname}"; key-name-hint = "${bootscr_sign_keyname}";
}; };
@@ -383,7 +383,7 @@ fitimage_emit_section_config() {
if [ -n "${bootscr_id}" ]; then if [ -n "${bootscr_id}" ]; then
conf_desc="${conf_desc}${sep}u-boot script" conf_desc="${conf_desc}${sep}u-boot script"
sep=", " sep=", "
bootscr_line="bootscr = \"bootscr@${bootscr_id}\";" bootscr_line="bootscr = \"bootscr-${bootscr_id}\";"
fi fi
if [ -n "${config_id}" ]; then if [ -n "${config_id}" ]; then