Skip to contentSkip to conversation

kernel-fit-image.bbclass: Do not include kernel property in DTBO config subnodes

PATCH New Marek Vasut 1 participant 1 message Jun 16

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel-fit-image.bbclass: Do not include kernel property in DTBO config subnodes

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")

---
Cc: Adrian Freihofer <[email protected]>
Cc: Richard Purdie <[email protected]>
Cc: Yoann Congal <[email protected]>
---
NOTE: This should ideally be added into OE 6.0 too

---
 meta/lib/oe/fitimage.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
meta/lib/oe/fitimage.py +6 -1
index 881d0eae0ab..d7e21171ab9 100644
@@ -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:
Signature · 1 line
2.53.0