summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel-arch.bbclass16
-rw-r--r--meta/packages/linux/linux-wrs_git.bb2
2 files changed, 9 insertions, 9 deletions
diff --git a/meta/classes/kernel-arch.bbclass b/meta/classes/kernel-arch.bbclass
index cf50356da..d6ae2e71a 100644
--- a/meta/classes/kernel-arch.bbclass
+++ b/meta/classes/kernel-arch.bbclass
@@ -5,7 +5,7 @@
#
valid_archs = "alpha cris ia64 \
- x86_64 i386 x86 \
+ i386 x86 \
m68knommu m68k ppc powerpc ppc64 \
sparc sparc64 \
arm arm26 \
@@ -19,13 +19,13 @@ def map_kernel_arch(a, d):
valid_archs = bb.data.getVar('valid_archs', d, 1).split()
- if re.match('(i.86|athlon)$', a): return 'x86'
- elif re.match('arm26$', a): return 'arm26'
- elif re.match('armeb$', a): return 'arm'
- elif re.match('mipsel$', a): return 'mips'
- elif re.match('sh(3|4)$', a): return 'sh'
- elif re.match('bfin', a): return 'blackfin'
- elif a in valid_archs: return a
+ if re.match('(i.86|athlon|x86.64)$', a): return 'x86'
+ elif re.match('arm26$', a): return 'arm26'
+ elif re.match('armeb$', a): return 'arm'
+ elif re.match('mipsel$', a): return 'mips'
+ elif re.match('sh(3|4)$', a): return 'sh'
+ elif re.match('bfin', a): return 'blackfin'
+ elif a in valid_archs: return a
else:
bb.error("cannot map '%s' to a linux kernel architecture" % a)
diff --git a/meta/packages/linux/linux-wrs_git.bb b/meta/packages/linux/linux-wrs_git.bb
index 60248f931..427c97b1b 100644
--- a/meta/packages/linux/linux-wrs_git.bb
+++ b/meta/packages/linux/linux-wrs_git.bb
@@ -37,7 +37,7 @@ do_patch() {
defconfig=${WORKDIR}/defconfig
fi
- createme ${TARGET_ARCH} ${WRMACHINE}-${LINUX_KERNEL_TYPE} ${defconfig}
+ createme ${ARCH} ${WRMACHINE}-${LINUX_KERNEL_TYPE} ${defconfig}
if [ $? -ne 0 ]; then
echo "ERROR. Could not create ${WRMACHINE}-${LINUX_KERNEL_TYPE}"
exit 1