From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 31 Jul 2026 20:53:18 +0000 (+0100)
Subject: lib/oe/kernel: Simplify map_uboot_arch
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dabb172b4d80b44d53293b6ccbce2bd86d8d11c2;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

lib/oe/kernel: Simplify map_uboot_arch

The main kernel map function would already handle x86 correctly.

Modern u-boot already handles both forms of powerpc and ppc correctly to
so we don't need this legacy function mapping for it.

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

diff --git a/meta/lib/oe/kernel.py b/meta/lib/oe/kernel.py
index 6c57ef402e..ff88c41b21 100644
--- a/meta/lib/oe/kernel.py
+++ b/meta/lib/oe/kernel.py
@@ -41,11 +41,7 @@ def map_kernel_arch(d):
 # Return a value for the -A parameter to u-boot's mkimage
 # This would be the value from the table in boot/image.c:uimage_arch
 def map_uboot_arch(d):
-    a = map_kernel_arch(d)
-
-    if   re.match('p(pc|owerpc)(|64)', a): return 'ppc'
-    elif re.match('i.86$', a): return 'x86'
-    return a
+    return map_kernel_arch(d)
 
 # parse kernel ABI version out of <linux/version.h>
 def get_version_headers(p):