summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf4
-rw-r--r--meta/conf/machine/include/arm/arch-arm.inc1
-rw-r--r--meta/conf/machine/include/ia32/arch-ia32.inc31
-rw-r--r--meta/conf/machine/include/mips/arch-mips.inc1
-rw-r--r--meta/conf/machine/include/powerpc/arch-powerpc.inc1
-rw-r--r--meta/conf/machine/include/tune-arm1136jf-s.inc2
-rw-r--r--meta/conf/machine/include/tune-arm920t.inc2
-rw-r--r--meta/conf/machine/include/tune-arm926ejs.inc2
-rw-r--r--meta/conf/machine/include/tune-arm9tdmi.inc2
-rw-r--r--meta/conf/machine/include/tune-armv7.inc2
-rw-r--r--meta/conf/machine/include/tune-atom.inc9
-rw-r--r--meta/conf/machine/include/tune-c3.inc2
-rw-r--r--meta/conf/machine/include/tune-core2.inc21
-rw-r--r--meta/conf/machine/include/tune-cortexa8.inc3
-rw-r--r--meta/conf/machine/include/tune-cortexm1.inc2
-rw-r--r--meta/conf/machine/include/tune-cortexm3.inc2
-rw-r--r--meta/conf/machine/include/tune-cortexr4.inc2
-rw-r--r--meta/conf/machine/include/tune-ep9312.inc2
-rw-r--r--meta/conf/machine/include/tune-i586.inc17
-rw-r--r--meta/conf/machine/include/tune-iwmmxt.inc2
-rw-r--r--meta/conf/machine/include/tune-mips32.inc2
-rw-r--r--meta/conf/machine/include/tune-ppc603e.inc2
-rw-r--r--meta/conf/machine/include/tune-ppce300c2.inc2
-rw-r--r--meta/conf/machine/include/tune-ppce500.inc2
-rw-r--r--meta/conf/machine/include/tune-ppce500mc.inc2
-rw-r--r--meta/conf/machine/include/tune-ppce500v2.inc2
-rw-r--r--meta/conf/machine/include/tune-strongarm1100.inc2
-rw-r--r--meta/conf/machine/include/tune-x86_64.inc6
-rw-r--r--meta/conf/machine/include/tune-xscale.inc2
29 files changed, 96 insertions, 36 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 9d1c7690bc..380da1c5bb 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -83,6 +83,8 @@ HOST_EXEEXT = ""
83 83
84TUNE_ARCH ??= "INVALID" 84TUNE_ARCH ??= "INVALID"
85TUNE_CCARGS ??= "" 85TUNE_CCARGS ??= ""
86TUNE_FEATURES ??= "${TUNE_FEATURES_tune-${DEFAULTTUNE}}"
87PACKAGE_EXTRA_ARCHS_tune-${DEFAULTTUNE} ??= "${TARGET_ARCH}"
86 88
87TARGET_ARCH = "${TUNE_ARCH}" 89TARGET_ARCH = "${TUNE_ARCH}"
88TARGET_OS = "INVALID" 90TARGET_OS = "INVALID"
@@ -100,7 +102,7 @@ SDK_CC_ARCH = "${BUILD_CC_ARCH}"
100 102
101PACKAGE_ARCH = "${TUNE_PKGARCH}" 103PACKAGE_ARCH = "${TUNE_PKGARCH}"
102MACHINE_ARCH = "${@[bb.data.getVar('TUNE_PKGARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))].replace('-', '_')}" 104MACHINE_ARCH = "${@[bb.data.getVar('TUNE_PKGARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))].replace('-', '_')}"
103PACKAGE_EXTRA_ARCHS ??= "${TARGET_ARCH}" 105PACKAGE_EXTRA_ARCHS ??= "${PACKAGE_EXTRA_ARCHS_tune-${DEFAULTTUNE}}"
104PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}" 106PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}"
105# MACHINE_ARCH shouldn't be included here as a variable dependency 107# MACHINE_ARCH shouldn't be included here as a variable dependency
106# since machine specific packages are handled using multimachine 108# since machine specific packages are handled using multimachine
diff --git a/meta/conf/machine/include/arm/arch-arm.inc b/meta/conf/machine/include/arm/arch-arm.inc
new file mode 100644
index 0000000000..e773d14c2a
--- /dev/null
+++ b/meta/conf/machine/include/arm/arch-arm.inc
@@ -0,0 +1 @@
TUNE_ARCH = "arm"
diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc b/meta/conf/machine/include/ia32/arch-ia32.inc
new file mode 100644
index 0000000000..d1d66052a1
--- /dev/null
+++ b/meta/conf/machine/include/ia32/arch-ia32.inc
@@ -0,0 +1,31 @@
1#
2# IA32 Architecture definition
3#
4
5DEFAULTTUNE ?= "x86"
6TARGET_FPU ?= ""
7
8# ELF32 ABI
9TUNEVALID[m32] = "IA32 ELF32 standard ABI"
10TUNECONFLICTS[m32] = "m64"
11TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "i586", "" ,d)}"
12TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}"
13
14# ELF64 ABI
15TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI"
16TUNECONFLICT[m64] = "m32"
17TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m64", "x86_64", "" ,d)}"
18TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
19
20TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "x86", "x86_64", d)}"
21
22# Default Tune configurations
23AVAILTUNES += "x86"
24TUNE_FEATURES_tune-x86 ?= "m32"
25BASE_LIB_tune-x86 ?= "lib"
26PACKAGE_EXTRA_ARCHS_tune-x86 = "x86"
27
28AVAILTUNES += "x86-64"
29TUNE_FEATURES_tune-x86-64 ?= "m64"
30BASE_LIB_tune-x86-64 ?= "lib64"
31PACKAGE_EXTRA_ARCHS_tune-x86-64 = "x86_64"
diff --git a/meta/conf/machine/include/mips/arch-mips.inc b/meta/conf/machine/include/mips/arch-mips.inc
new file mode 100644
index 0000000000..f7f4eeddff
--- /dev/null
+++ b/meta/conf/machine/include/mips/arch-mips.inc
@@ -0,0 +1 @@
TUNE_ARCH = "mips"
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
new file mode 100644
index 0000000000..5ab81d4156
--- /dev/null
+++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
@@ -0,0 +1 @@
TUNE_ARCH = "powerpc"
diff --git a/meta/conf/machine/include/tune-arm1136jf-s.inc b/meta/conf/machine/include/tune-arm1136jf-s.inc
index c1d0c0705b..953f0dd966 100644
--- a/meta/conf/machine/include/tune-arm1136jf-s.inc
+++ b/meta/conf/machine/include/tune-arm1136jf-s.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "arm" 1require conf/machine/include/arm/arch-arm.inc
2 2
3TUNE_CCARGS = "-march=armv6j -mtune=arm1136jf-s" 3TUNE_CCARGS = "-march=armv6j -mtune=arm1136jf-s"
4TUNE_CCARGS += "${@['', '-mfloat-abi=softfp -mfpu=vfp'][(bb.data.getVar('TARGET_FPU', d, 1) == 'soft') and (bb.data.getVar('CPU_FEATURES', d, 1).find('vfp') != -1)]}" 4TUNE_CCARGS += "${@['', '-mfloat-abi=softfp -mfpu=vfp'][(bb.data.getVar('TARGET_FPU', d, 1) == 'soft') and (bb.data.getVar('CPU_FEATURES', d, 1).find('vfp') != -1)]}"
diff --git a/meta/conf/machine/include/tune-arm920t.inc b/meta/conf/machine/include/tune-arm920t.inc
index 3f30e2ab87..6c8702657c 100644
--- a/meta/conf/machine/include/tune-arm920t.inc
+++ b/meta/conf/machine/include/tune-arm920t.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "arm" 1require conf/machine/include/arm/arch-arm.inc
2 2
3TUNE_PKGARCH = "armv4t" 3TUNE_PKGARCH = "armv4t"
4TUNE_CCARGS = "-march=armv4t -mtune=arm920t" 4TUNE_CCARGS = "-march=armv4t -mtune=arm920t"
diff --git a/meta/conf/machine/include/tune-arm926ejs.inc b/meta/conf/machine/include/tune-arm926ejs.inc
index 049f57cb3f..543ab62c70 100644
--- a/meta/conf/machine/include/tune-arm926ejs.inc
+++ b/meta/conf/machine/include/tune-arm926ejs.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "arm" 1require conf/machine/include/arm/arch-arm.inc
2 2
3TUNE_PKGARCH = "armv5te" 3TUNE_PKGARCH = "armv5te"
4PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te" 4PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te"
diff --git a/meta/conf/machine/include/tune-arm9tdmi.inc b/meta/conf/machine/include/tune-arm9tdmi.inc
index 0ed2f40908..f1001ac65d 100644
--- a/meta/conf/machine/include/tune-arm9tdmi.inc
+++ b/meta/conf/machine/include/tune-arm9tdmi.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "arm" 1require conf/machine/include/arm/arch-arm.inc
2 2
3TUNE_PKGARCH = "armv4t" 3TUNE_PKGARCH = "armv4t"
4PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t" 4PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t"
diff --git a/meta/conf/machine/include/tune-armv7.inc b/meta/conf/machine/include/tune-armv7.inc
index 2e32323ebf..8a68c0abe3 100644
--- a/meta/conf/machine/include/tune-armv7.inc
+++ b/meta/conf/machine/include/tune-armv7.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "arm" 1require conf/machine/include/arm/arch-arm.inc
2 2
3# valid options for -march: `armv7', `armv7-a', `armv7-r', `armv7-m' 3# valid options for -march: `armv7', `armv7-a', `armv7-r', `armv7-m'
4# valid option for -mtune: `cortex-a8', `cortex-r4', `cortex-m3', `cortex-m1' 4# valid option for -mtune: `cortex-a8', `cortex-r4', `cortex-m3', `cortex-m1'
diff --git a/meta/conf/machine/include/tune-atom.inc b/meta/conf/machine/include/tune-atom.inc
index 52acd12ba8..5e1bb74c6c 100644
--- a/meta/conf/machine/include/tune-atom.inc
+++ b/meta/conf/machine/include/tune-atom.inc
@@ -1,7 +1,2 @@
1TUNE_ARCH = "i586" 1# Atom tunings are the same as core2 for now...
2 2require conf/machine/include/tune-core2.inc
3TUNE_PKGARCH = "core2"
4TUNE_CCARGS = "-m32 -march=core2 -msse3 -mtune=generic -mfpmath=sse"
5#MOBLIN_CFLAGS = "-Os -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables"
6
7PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686 core2"
diff --git a/meta/conf/machine/include/tune-c3.inc b/meta/conf/machine/include/tune-c3.inc
index dbe1e43abc..e1569f5952 100644
--- a/meta/conf/machine/include/tune-c3.inc
+++ b/meta/conf/machine/include/tune-c3.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "i586" 1require conf/machine/include/ia32/arch-ia32.inc
2 2
3TUNE_PKGARCH = "i586" 3TUNE_PKGARCH = "i586"
4 4
diff --git a/meta/conf/machine/include/tune-core2.inc b/meta/conf/machine/include/tune-core2.inc
new file mode 100644
index 0000000000..138ca170d0
--- /dev/null
+++ b/meta/conf/machine/include/tune-core2.inc
@@ -0,0 +1,21 @@
1DEFAULTTUNE ?= "core2"
2TUNE_ARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "i686", "x86_64", d)}"
3TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "core2", "core2-64", d)}"
4
5require conf/machine/include/tune-i586.inc
6
7# Extra tune features
8TUNEVALID[core2] = "Enable core2 specific processor optimizations"
9TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "core2", "-march=core2 -msse3 -mtune=generic -mfpmath=sse", "", d)}"
10
11# Extra tune selections
12AVAILTUNES += "core2"
13TUNE_FEATURES_tune-core2 ?= "${TUNE_FEATURES_tune-x86} core2"
14BASE_LIB_tune-core2 ?= "lib"
15PACKAGE_EXTRA_ARCHS_tune-core2 = "${PACKAGE_EXTRA_ARCHS_tune-x86} i386 i486 i586 i686 core2"
16
17AVAILTUNES += "core2-64"
18TUNE_FEATURES_tune-core2-64 ?= "${TUNE_FEATURES_tune-x86-64} core2"
19BASE_LIB_tune-core2-64 ?= "lib64"
20PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} core2-64"
21
diff --git a/meta/conf/machine/include/tune-cortexa8.inc b/meta/conf/machine/include/tune-cortexa8.inc
index 9be423abff..ae5095486b 100644
--- a/meta/conf/machine/include/tune-cortexa8.inc
+++ b/meta/conf/machine/include/tune-cortexa8.inc
@@ -1,4 +1,5 @@
1TUNE_ARCH = "arm" 1require conf/machine/include/arm/arch-arm.inc
2
2 3
3# Instead of using -mfpu=vfp[2] we can use -mfpu=neon to make use of gcc intrinsics[1] and vectorize loops with -ftree-vectorize[3] 4# Instead of using -mfpu=vfp[2] we can use -mfpu=neon to make use of gcc intrinsics[1] and vectorize loops with -ftree-vectorize[3]
4# [1] http://gcc.gnu.org/onlinedocs/gcc/ARM-NEON-Intrinsics.html 5# [1] http://gcc.gnu.org/onlinedocs/gcc/ARM-NEON-Intrinsics.html
diff --git a/meta/conf/machine/include/tune-cortexm1.inc b/meta/conf/machine/include/tune-cortexm1.inc
index d0d3b2cb17..b944db4552 100644
--- a/meta/conf/machine/include/tune-cortexm1.inc
+++ b/meta/conf/machine/include/tune-cortexm1.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "arm" 1require conf/machine/include/arm/arch-arm.inc
2 2
3TUNE_CCARGS = "-march=armv7 -mtune=cortex-m1 -mfpu=vfp -mfloat-abi=softfp" 3TUNE_CCARGS = "-march=armv7 -mtune=cortex-m1 -mfpu=vfp -mfloat-abi=softfp"
4TUNE_PKGARCH = "armv6" 4TUNE_PKGARCH = "armv6"
diff --git a/meta/conf/machine/include/tune-cortexm3.inc b/meta/conf/machine/include/tune-cortexm3.inc
index 495c8f6420..a77cbddfcd 100644
--- a/meta/conf/machine/include/tune-cortexm3.inc
+++ b/meta/conf/machine/include/tune-cortexm3.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "arm" 1require conf/machine/include/arm/arch-arm.inc
2 2
3# valid options for -march: `armv7', `armv7-m' 3# valid options for -march: `armv7', `armv7-m'
4TUNE_CCARGS = "-march=armv7-m -mtune=cortex-m3 -mfpu=vfp -mfloat-abi=softfp" 4TUNE_CCARGS = "-march=armv7-m -mtune=cortex-m3 -mfpu=vfp -mfloat-abi=softfp"
diff --git a/meta/conf/machine/include/tune-cortexr4.inc b/meta/conf/machine/include/tune-cortexr4.inc
index c775e8309e..c9193ca8c3 100644
--- a/meta/conf/machine/include/tune-cortexr4.inc
+++ b/meta/conf/machine/include/tune-cortexr4.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "arm" 1require conf/machine/include/arm/arch-arm.inc
2 2
3# valid options for -march: `armv7', `armv7-r' 3# valid options for -march: `armv7', `armv7-r'
4TUNE_CCARGS = "-march=armv7-r -mtune=cortex-r4 -mfpu=vfp -mfloat-abi=softfp" 4TUNE_CCARGS = "-march=armv7-r -mtune=cortex-r4 -mfpu=vfp -mfloat-abi=softfp"
diff --git a/meta/conf/machine/include/tune-ep9312.inc b/meta/conf/machine/include/tune-ep9312.inc
index 8c7fc5a1d8..e04a00a984 100644
--- a/meta/conf/machine/include/tune-ep9312.inc
+++ b/meta/conf/machine/include/tune-ep9312.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "arm" 1require conf/machine/include/arm/arch-arm.inc
2 2
3TUNE_CCARGS = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312" 3TUNE_CCARGS = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312"
4# add "-mfp=maverick" for newer gcc versions > 4.0 4# add "-mfp=maverick" for newer gcc versions > 4.0
diff --git a/meta/conf/machine/include/tune-i586.inc b/meta/conf/machine/include/tune-i586.inc
index 1dc44dfd67..ba655b94d3 100644
--- a/meta/conf/machine/include/tune-i586.inc
+++ b/meta/conf/machine/include/tune-i586.inc
@@ -1,6 +1,15 @@
1TUNE_ARCH = "i586" 1DEFAULTTUNE ?= "i586"
2TUNE_PKGARCH ?= "i586"
2 3
3TUNE_PKGARCH = "i586" 4require conf/machine/include/ia32/arch-ia32.inc
4TUNE_CCARGS = "-m32 -march=i586" 5
6# Extra tune features
7TUNEVALID[i586] = "Enable i586 specific processor optimizations"
8TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "i586", "-march=i586", "", d)}"
9
10# Extra tune selections
11AVAILTUNES += "i586"
12TUNE_FEATURES_tune-i586 ?= "${TUNE_FEATURES_tune-x86} i586"
13BASE_LIB_tune-i586 ?= "lib"
14PACKAGE_EXTRA_ARCHS_tune-i586 = "${PACKAGE_EXTRA_ARCHS_tune-x86} i386 i486 i586"
5 15
6PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
diff --git a/meta/conf/machine/include/tune-iwmmxt.inc b/meta/conf/machine/include/tune-iwmmxt.inc
index 236cede988..6bb76d5b32 100644
--- a/meta/conf/machine/include/tune-iwmmxt.inc
+++ b/meta/conf/machine/include/tune-iwmmxt.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "arm" 1require conf/machine/include/arm/arch-arm.inc
2 2
3# Configurations for the Intel PXA27x Appications Processor Family. 3# Configurations for the Intel PXA27x Appications Processor Family.
4# Please use tune-xscale for PXA255/PXA26x based processors. 4# Please use tune-xscale for PXA255/PXA26x based processors.
diff --git a/meta/conf/machine/include/tune-mips32.inc b/meta/conf/machine/include/tune-mips32.inc
index 182d16cf22..28b00479e2 100644
--- a/meta/conf/machine/include/tune-mips32.inc
+++ b/meta/conf/machine/include/tune-mips32.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "mips" 1require conf/machine/include/mips/arch-mips.inc
2 2
3TUNE_CCARGS = "-march=mips32" 3TUNE_CCARGS = "-march=mips32"
4TUNE_PKGARCH = "mips" 4TUNE_PKGARCH = "mips"
diff --git a/meta/conf/machine/include/tune-ppc603e.inc b/meta/conf/machine/include/tune-ppc603e.inc
index ec43cfe831..61c0669acf 100644
--- a/meta/conf/machine/include/tune-ppc603e.inc
+++ b/meta/conf/machine/include/tune-ppc603e.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "powerpc" 1require conf/machine/include/powerpc/arch-powerpc.inc
2 2
3TUNE_CCARGS = "-mcpu=603e -mhard-float" 3TUNE_CCARGS = "-mcpu=603e -mhard-float"
4TUNE_PKGARCH = "ppc603e" 4TUNE_PKGARCH = "ppc603e"
diff --git a/meta/conf/machine/include/tune-ppce300c2.inc b/meta/conf/machine/include/tune-ppce300c2.inc
index ac232424bf..a38e97c18b 100644
--- a/meta/conf/machine/include/tune-ppce300c2.inc
+++ b/meta/conf/machine/include/tune-ppce300c2.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "powerpc" 1require conf/machine/include/powerpc/arch-powerpc.inc
2 2
3TUNE_CCARGS = "-mcpu=e300c2 -msoft-float" 3TUNE_CCARGS = "-mcpu=e300c2 -msoft-float"
4TUNE_PKGARCH = "ppce300" 4TUNE_PKGARCH = "ppce300"
diff --git a/meta/conf/machine/include/tune-ppce500.inc b/meta/conf/machine/include/tune-ppce500.inc
index a342cfba9f..22208f0722 100644
--- a/meta/conf/machine/include/tune-ppce500.inc
+++ b/meta/conf/machine/include/tune-ppce500.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "powerpc" 1require conf/machine/include/powerpc/arch-powerpc.inc
2 2
3TUNE_CCARGS = "-mcpu=8540" 3TUNE_CCARGS = "-mcpu=8540"
4BASE_PACKAGE_ARCH = "ppce500" 4BASE_PACKAGE_ARCH = "ppce500"
diff --git a/meta/conf/machine/include/tune-ppce500mc.inc b/meta/conf/machine/include/tune-ppce500mc.inc
index 497c1a412d..182d019c32 100644
--- a/meta/conf/machine/include/tune-ppce500mc.inc
+++ b/meta/conf/machine/include/tune-ppce500mc.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "powerpc" 1require conf/machine/include/powerpc/arch-powerpc.inc
2 2
3TUNE_CCARGS = "-mcpu=e500mc" 3TUNE_CCARGS = "-mcpu=e500mc"
4TUNE_PKGARCH = "ppce500mc" 4TUNE_PKGARCH = "ppce500mc"
diff --git a/meta/conf/machine/include/tune-ppce500v2.inc b/meta/conf/machine/include/tune-ppce500v2.inc
index 1c56829795..daf2d58005 100644
--- a/meta/conf/machine/include/tune-ppce500v2.inc
+++ b/meta/conf/machine/include/tune-ppce500v2.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "powerpc" 1require conf/machine/include/powerpc/arch-powerpc.inc
2 2
3TUNE_CCARGS = "-mcpu=8548 -mabi=spe -mspe" 3TUNE_CCARGS = "-mcpu=8548 -mabi=spe -mspe"
4TUNE_PKGARCH = "ppce500v2" 4TUNE_PKGARCH = "ppce500v2"
diff --git a/meta/conf/machine/include/tune-strongarm1100.inc b/meta/conf/machine/include/tune-strongarm1100.inc
index ec290532a2..2b76069208 100644
--- a/meta/conf/machine/include/tune-strongarm1100.inc
+++ b/meta/conf/machine/include/tune-strongarm1100.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "arm" 1require conf/machine/include/arm/arch-arm.inc
2 2
3TUNE_PKGARCH = "arm" 3TUNE_PKGARCH = "arm"
4 4
diff --git a/meta/conf/machine/include/tune-x86_64.inc b/meta/conf/machine/include/tune-x86_64.inc
index 08ff30a23d..04b0f96678 100644
--- a/meta/conf/machine/include/tune-x86_64.inc
+++ b/meta/conf/machine/include/tune-x86_64.inc
@@ -1,5 +1,3 @@
1TUNE_ARCH = "x86_64" 1require conf/machine/include/ia32/arch-ia32.inc
2
3TUNE_PKGARCH = "x86_64"
4TUNE_CCARGS = "-m64"
5 2
3DEFAULTTUNE = "x86-64"
diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc
index 9618a8b513..71dba5bb1e 100644
--- a/meta/conf/machine/include/tune-xscale.inc
+++ b/meta/conf/machine/include/tune-xscale.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "arm" 1require conf/machine/include/arm/arch-arm.inc
2 2
3INHERIT += "siteinfo" 3INHERIT += "siteinfo"
4 4