Skip to contentSkip to conversation

kernel-fit-image: make "os" field of loadables optional

PATCH New Denys Dmytriyenko 1 participant 1 message Nov 20

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel-fit-image: make "os" field of loadables optional

From: Denys Dmytriyenko <[email protected]>

It is not required to specify the "os" field for the loadables section, which current implementation incorrectly defaults to "linux". Make it truly optional and if not specified, simply omit it from the section.

---
 meta/conf/image-fitimage.conf | 2 +-
 meta/lib/oe/fitimage.py       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
meta/conf/image-fitimage.conf +1 -1
index a06d30e494..44b7554cfa 100644
@@ -99,6 +99,6 @@ FIT_UBOOT_ENV ?= ""
 #   FIT_LOADABLE_LOADADDRESS[atf] = "0x204E0000"
 #   FIT_LOADABLE_ENTRYPOINT[atf] = "0x204E0000"
 # Sensible defalts will be used for some parameters (compression, description,
-# arch, os) if the corresponding flag is not set, while others (load address
+# arch) if the corresponding flag is not set, while others (os, load address
 # and entry point) will be omitted in the final FIT.
 FIT_LOADABLES ?= ""
meta/lib/oe/fitimage.py +3 -1
index c97b334413..dec1da79ff 100644
@@ -407,9 +407,11 @@ class ItsNodeRootKernel(ItsNode):
         opt_props = {
             "data": '/incbin/("' + filepath + '")',
             "arch": arch if arch is not None else self._arch,
-            "os": fit_os if fit_os is not None else self._os,
         }
 
+
+        if fit_os:
+            opt_props["os"] = fit_os
         if load:
             opt_props["load"] = f"<{load}>"
         if entry:
Signature · 1 line
2.25.1