diff options
| author |   Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com> | 2021-03-31 10:23:13 -0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-04-06 22:37:19 +0100 |
| commit | dc26d35e0935f30af55a3d2cb5c501d1b5c35437 (patch) | |
| tree | 94cfb50d3a59300fa85c82874d27e537d2dde740 /meta/lib | |
| parent | 6a2a1a0d38499b2537e1b39ac34677cd52b81fc0 (diff) | |
| download | openembedded-core-dc26d35e0935f30af55a3d2cb5c501d1b5c35437.tar.gz | |
uboot: Fixes SPL verified boot on corner cases
* The kernel-fitimage class adds a do_assemble_fitimage_initramfs task
regardless of INITRAMFS_IMAGE_BUNDLE setting, which in some cases can
result in that task running after do_uboot_assemble_fitimage and
overwriting the u-boot-spl.dtb file with the pristine version (without
public key). Fix this by making do_uboot_assemble_fitimage dependant
on both do_assemble_fitimage_* tasks, regardless of the aforementioned
setting.
* Adjust 'type' and 'os' on the U-boot fitimage its script so that
mkimage/dumpimage can recognize them.
* Move the deployment of the u-boot-spl-nodtb files outside of
concat_spl_dtb_helper(), so that we can better isolate the scenarios
of creating an (unsigned) U-Boot fitimage versus also signing it. This
prevents some stale files from being deployed in the images directory.
* Remove any u-boot-fitImage and u-boot-its files from build tree, in
case the build tree is being reused across bitbake calls.
Signed-off-by: Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/fitimage.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/cases/fitimage.py b/meta/lib/oeqa/selftest/cases/fitimage.py index b911fded74..815ee48c05 100644 --- a/meta/lib/oeqa/selftest/cases/fitimage.py +++ b/meta/lib/oeqa/selftest/cases/fitimage.py @@ -293,7 +293,7 @@ FIT_SIGN_INDIVIDUAL = "1" # different architectures. its_field_check = [ 'description = "A model description";', - 'type = "uboot";', + 'type = "standalone";', 'load = <0x80080000>;', 'entry = <0x80080000>;', 'default = "conf";', @@ -376,7 +376,7 @@ UBOOT_MKIMAGE_SIGN_ARGS = "-c 'a smart U-Boot comment'" # different architectures. its_field_check = [ 'description = "A model description";', - 'type = "uboot";', + 'type = "standalone";', 'load = <0x80080000>;', 'entry = <0x80080000>;', 'default = "conf";', |