kernel-arch.bbclass: merge improved arch detection from OE.dev

Signed-off-by: Joshua Lock <josh@linux.intel.com>

diff --git a/meta/classes/kernel-arch.bbclass b/meta/classes/kernel-arch.bbclass
index 35c26b89ff331f51300df8f1c18bfc41cc0dea26..8894fa554c72645d2acca3539ab7883887e039fe 100644 (file)
--- a/meta/classes/kernel-arch.bbclass
+++ b/meta/classes/kernel-arch.bbclass
@@ -32,8 +32,10 @@ def map_kernel_arch(a, d):
 export ARCH = "${@map_kernel_arch(bb.data.getVar('TARGET_ARCH', d, 1), d)}"
 
 def map_uboot_arch(a, d):
-       if a == "powerpc":
-               return "ppc"
+       import re
+
+       if   re.match('powerpc$', a): return 'ppc'
+       elif re.match('i.86$', a): return 'x86'
        return a
 
 export UBOOT_ARCH = "${@map_uboot_arch(bb.data.getVar('ARCH', d, 1), d)}"