From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sat, 1 Aug 2026 12:32:31 +0000 (+0100)
Subject: kernel-fit-image: Swap UBOOT_ARCH for oe.kernel.map_uboot_arch call
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d45e6d99c59edacbb586182b565b4ff8248c6d56;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

kernel-fit-image: Swap UBOOT_ARCH for oe.kernel.map_uboot_arch call

We can just call the function directly, no need to use the inherit and
variable.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes-recipe/kernel-fit-image.bbclass b/meta/classes-recipe/kernel-fit-image.bbclass
index 3ace09ef5c..7b2bcd4673 100644
--- a/meta/classes-recipe/kernel-fit-image.bbclass
+++ b/meta/classes-recipe/kernel-fit-image.bbclass
@@ -1,5 +1,5 @@
 
-inherit kernel-arch kernel-artifact-names uboot-config deploy
+inherit kernel-artifact-names uboot-config deploy
 require conf/image-fitimage.conf
 
 S = "${UNPACKDIR}"
@@ -76,7 +76,7 @@ python do_compile() {
     # Collect all the its nodes before the its file is generated and mkimage gets executed
     root_node = oe.fitimage.ItsNodeRootKernel(
         d.getVar("FIT_DESC"), d.getVar("FIT_ADDRESS_CELLS"),
-        d.getVar('HOST_PREFIX'), d.getVar('UBOOT_ARCH'), d.getVar('FIT_OS'),
+        d.getVar('HOST_PREFIX'), oe.kernel.map_uboot_arch(d), d.getVar('FIT_OS'),
         d.getVar("FIT_CONF_PREFIX"),
         oe.types.boolean(d.getVar('FIT_KERNEL_SIGN_ENABLE')), d.getVar("FIT_KERNEL_SIGN_KEYDIR"),
         d.getVar("UBOOT_MKIMAGE"), d.getVar("UBOOT_MKIMAGE_DTCOPTS"),