From dc26d35e0935f30af55a3d2cb5c501d1b5c35437 Mon Sep 17 00:00:00 2001 From: Klaus Heinrich Kiwi Date: Wed, 31 Mar 2021 10:23:13 -0300 Subject: 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 Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/fitimage.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/lib') 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";', -- cgit 1.2.3-korg