| Message ID | 20260630074356.10265-1-marek.vasut@mailbox.org |
|---|---|
| State | New |
| Headers | show |
| Series | [wrynose] kernel-fit-image.bbclass: Do not include kernel property in DTBO config subnodes | expand |
diff --git a/meta/lib/oe/fitimage.py b/meta/lib/oe/fitimage.py index 881d0eae0ab..d7e21171ab9 100644 --- a/meta/lib/oe/fitimage.py +++ b/meta/lib/oe/fitimage.py @@ -425,8 +425,13 @@ class ItsNodeRootKernel(ItsNode): opt_props = {} conf_desc = [] sign_entries = [] + include_kernel = 1 - if self._kernel: + # DTBO configuration sections do not include kernel property + if dtb and os.path.splitext(dtb.name)[1] == ".dtbo": + include_kernel = 0 + + if self._kernel and include_kernel: conf_desc.append("Linux kernel") opt_props["kernel"] = self._kernel.name if self._sign_enable:
The OE 5.0 implementation of fitImage generation did not include the kernel property in DTBO configuration node subnodes, while the current OE 6.0 implementation does. The previous implementation was correct, because kernel together with only a DTBO overlay can not form bootable result. The kernel property should only be part of the configuration subnode which includes both kernel and DTB. Fix this. Fixes: 05d0c7342d76 ("kernel-fit-image.bbclass: add a new FIT image implementation") Signed-off-by: Marek Vasut <marek.vasut@mailbox.org> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 06ed34005957a6afb88270603df5e545941546b0) --- Cc: Adrian Freihofer <adrian.freihofer@siemens.com> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Cc: Yoann Congal <yoann.congal@smile.fr> --- meta/lib/oe/fitimage.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)