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 <[email protected]>
Signed-off-by: Mathieu Dubois-Briand <[email protected]>
Signed-off-by: Ross Burton <[email protected]>
Signed-off-by: Richard Purdie <[email protected]>
(cherry picked from commit 06ed34005957a6afb88270603df5e545941546b0)
---
Cc: Adrian Freihofer <[email protected]>
Cc: Richard Purdie <[email protected]>
Cc: Yoann Congal <[email protected]>
---
meta/lib/oe/fitimage.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
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:
--
2.53.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#239861):
https://lists.openembedded.org/g/openembedded-core/message/239861
Mute This Topic: https://lists.openembedded.org/mt/120043543/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
