diff options
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/bitbake.conf | 3 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-arm1136jf-s.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-arm920t.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-arm926ejs.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-arm9tdmi.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-armv7.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-c3.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-cortexa8.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-cortexm1.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-cortexm3.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-cortexr4.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-ep9312.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-iwmmxt.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-ppc603e.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-ppce500.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-supersparc.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-xscale.inc | 2 |
17 files changed, 18 insertions, 17 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 74b593a034..ad85dc3861 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -86,7 +86,8 @@ TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS' | |||
86 | TARGET_PREFIX = "${TARGET_SYS}-" | 86 | TARGET_PREFIX = "${TARGET_SYS}-" |
87 | TARGET_CC_ARCH = "" | 87 | TARGET_CC_ARCH = "" |
88 | 88 | ||
89 | PACKAGE_ARCH = "${HOST_ARCH}" | 89 | BASE_PACKAGE_ARCH = "${HOST_ARCH}" |
90 | PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" | ||
90 | MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" | 91 | MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" |
91 | PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}" | 92 | PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}" |
92 | 93 | ||
diff --git a/meta/conf/machine/include/tune-arm1136jf-s.inc b/meta/conf/machine/include/tune-arm1136jf-s.inc index 7a9a821047..be5aedc509 100644 --- a/meta/conf/machine/include/tune-arm1136jf-s.inc +++ b/meta/conf/machine/include/tune-arm1136jf-s.inc | |||
@@ -1,7 +1,7 @@ | |||
1 | TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s" | 1 | TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s" |
2 | TARGET_CC_ARCH += "${@['', '-mfloat-abi=softfp -mfpu=vfp'][(bb.data.getVar('TARGET_FPU', d, 1) == 'soft') and (bb.data.getVar('CPU_FEATURES', d, 1).find('vfp') != -1)]}" | 2 | TARGET_CC_ARCH += "${@['', '-mfloat-abi=softfp -mfpu=vfp'][(bb.data.getVar('TARGET_FPU', d, 1) == 'soft') and (bb.data.getVar('CPU_FEATURES', d, 1).find('vfp') != -1)]}" |
3 | FEED_ARCH = "armv6" | 3 | FEED_ARCH = "armv6" |
4 | PACKAGE_ARCH = "armv6" | 4 | BASE_PACKAGE_ARCH = "armv6" |
5 | 5 | ||
6 | ARM_INSTRUCTION_SET = "${@['thumb','arm'][bb.data.getVar('CPU_FEATURES', d, 1).find('thumb') == -1]}" | 6 | ARM_INSTRUCTION_SET = "${@['thumb','arm'][bb.data.getVar('CPU_FEATURES', d, 1).find('thumb') == -1]}" |
7 | 7 | ||
diff --git a/meta/conf/machine/include/tune-arm920t.inc b/meta/conf/machine/include/tune-arm920t.inc index b142d3325a..1f7a04bb3b 100644 --- a/meta/conf/machine/include/tune-arm920t.inc +++ b/meta/conf/machine/include/tune-arm920t.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | FEED_ARCH = "armv4t" | 1 | FEED_ARCH = "armv4t" |
2 | PACKAGE_ARCH = "armv4t" | 2 | BASE_PACKAGE_ARCH = "armv4t" |
3 | TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" | 3 | TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" |
4 | 4 | ||
diff --git a/meta/conf/machine/include/tune-arm926ejs.inc b/meta/conf/machine/include/tune-arm926ejs.inc index c3e8d7aefc..e80ef10490 100644 --- a/meta/conf/machine/include/tune-arm926ejs.inc +++ b/meta/conf/machine/include/tune-arm926ejs.inc | |||
@@ -4,4 +4,4 @@ FEED_ARCH = "armv5te" | |||
4 | #TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" | 4 | #TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" |
5 | # For gcc 4.x you need: | 5 | # For gcc 4.x you need: |
6 | TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s" | 6 | TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s" |
7 | PACKAGE_ARCH = "armv5te" | 7 | BASE_PACKAGE_ARCH = "armv5te" |
diff --git a/meta/conf/machine/include/tune-arm9tdmi.inc b/meta/conf/machine/include/tune-arm9tdmi.inc index d097b07739..39e4493014 100644 --- a/meta/conf/machine/include/tune-arm9tdmi.inc +++ b/meta/conf/machine/include/tune-arm9tdmi.inc | |||
@@ -1,2 +1,2 @@ | |||
1 | PACKAGE_ARCH = "armv4t" | 1 | BASE_PACKAGE_ARCH = "armv4t" |
2 | TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi" | 2 | TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi" |
diff --git a/meta/conf/machine/include/tune-armv7.inc b/meta/conf/machine/include/tune-armv7.inc index 6276fe6798..96c8c64904 100644 --- a/meta/conf/machine/include/tune-armv7.inc +++ b/meta/conf/machine/include/tune-armv7.inc | |||
@@ -3,4 +3,4 @@ | |||
3 | # This will NOT compile programs in 'ARM' mode, which is what you really want | 3 | # This will NOT compile programs in 'ARM' mode, which is what you really want |
4 | TARGET_CC_ARCH = "-march=armv7 -mfpu=vfp -mfloat-abi=softfp" | 4 | TARGET_CC_ARCH = "-march=armv7 -mfpu=vfp -mfloat-abi=softfp" |
5 | FEED_ARCH = "armv7" | 5 | FEED_ARCH = "armv7" |
6 | PACKAGE_ARCH = "armv7" | 6 | BASE_PACKAGE_ARCH = "armv7" |
diff --git a/meta/conf/machine/include/tune-c3.inc b/meta/conf/machine/include/tune-c3.inc index e6a522af10..107341eb62 100644 --- a/meta/conf/machine/include/tune-c3.inc +++ b/meta/conf/machine/include/tune-c3.inc | |||
@@ -1,3 +1,3 @@ | |||
1 | TARGET_CC_ARCH = "-march=c3 -mtune=c3" | 1 | TARGET_CC_ARCH = "-march=c3 -mtune=c3" |
2 | PACKAGE_ARCH = "i586" | 2 | BASE_PACKAGE_ARCH = "i586" |
3 | 3 | ||
diff --git a/meta/conf/machine/include/tune-cortexa8.inc b/meta/conf/machine/include/tune-cortexa8.inc index 0133240de4..f8ddfea710 100644 --- a/meta/conf/machine/include/tune-cortexa8.inc +++ b/meta/conf/machine/include/tune-cortexa8.inc | |||
@@ -6,4 +6,4 @@ | |||
6 | TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp" | 6 | TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp" |
7 | TARGET_CC_ARCH_pn-libxcursor = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp" | 7 | TARGET_CC_ARCH_pn-libxcursor = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp" |
8 | FEED_ARCH = "armv7a" | 8 | FEED_ARCH = "armv7a" |
9 | PACKAGE_ARCH = "armv7a" | 9 | BASE_PACKAGE_ARCH = "armv7a" |
diff --git a/meta/conf/machine/include/tune-cortexm1.inc b/meta/conf/machine/include/tune-cortexm1.inc index a0d18b69c6..6c4a70a24d 100644 --- a/meta/conf/machine/include/tune-cortexm1.inc +++ b/meta/conf/machine/include/tune-cortexm1.inc | |||
@@ -1,3 +1,3 @@ | |||
1 | TARGET_CC_ARCH = "-march=armv7 -mtune=cortex-m1 -mfpu=vfp -mfloat-abi=softfp" | 1 | TARGET_CC_ARCH = "-march=armv7 -mtune=cortex-m1 -mfpu=vfp -mfloat-abi=softfp" |
2 | FEED_ARCH = "armv6" | 2 | FEED_ARCH = "armv6" |
3 | PACKAGE_ARCH = "armv6" | 3 | BASE_PACKAGE_ARCH = "armv6" |
diff --git a/meta/conf/machine/include/tune-cortexm3.inc b/meta/conf/machine/include/tune-cortexm3.inc index 3598998a74..6da9aeedda 100644 --- a/meta/conf/machine/include/tune-cortexm3.inc +++ b/meta/conf/machine/include/tune-cortexm3.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | # valid options for -march: `armv7', `armv7-m' | 1 | # valid options for -march: `armv7', `armv7-m' |
2 | TARGET_CC_ARCH = "-march=armv7-m -mtune=cortex-m3 -mfpu=vfp -mfloat-abi=softfp" | 2 | TARGET_CC_ARCH = "-march=armv7-m -mtune=cortex-m3 -mfpu=vfp -mfloat-abi=softfp" |
3 | FEED_ARCH = "armv7" | 3 | FEED_ARCH = "armv7" |
4 | PACKAGE_ARCH = "armv7" | 4 | BASE_PACKAGE_ARCH = "armv7" |
diff --git a/meta/conf/machine/include/tune-cortexr4.inc b/meta/conf/machine/include/tune-cortexr4.inc index 93c82e8607..b8bb7f50ae 100644 --- a/meta/conf/machine/include/tune-cortexr4.inc +++ b/meta/conf/machine/include/tune-cortexr4.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | # valid options for -march: `armv7', `armv7-r' | 1 | # valid options for -march: `armv7', `armv7-r' |
2 | TARGET_CC_ARCH = "-march=armv7-r -mtune=cortex-r4 -mfpu=vfp -mfloat-abi=softfp" | 2 | TARGET_CC_ARCH = "-march=armv7-r -mtune=cortex-r4 -mfpu=vfp -mfloat-abi=softfp" |
3 | FEED_ARCH = "armv7" | 3 | FEED_ARCH = "armv7" |
4 | PACKAGE_ARCH = "armv7" | 4 | BASE_PACKAGE_ARCH = "armv7" |
diff --git a/meta/conf/machine/include/tune-ep9312.inc b/meta/conf/machine/include/tune-ep9312.inc index 0982cf2a13..2cfdf5270f 100644 --- a/meta/conf/machine/include/tune-ep9312.inc +++ b/meta/conf/machine/include/tune-ep9312.inc | |||
@@ -2,5 +2,5 @@ TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312" | |||
2 | # add "-mfp=maverick" for newer gcc versions > 4.0 | 2 | # add "-mfp=maverick" for newer gcc versions > 4.0 |
3 | 3 | ||
4 | #set arch to ep9312 for all generated packages | 4 | #set arch to ep9312 for all generated packages |
5 | PACKAGE_ARCH = "ep9312" | 5 | BASE_PACKAGE_ARCH = "ep9312" |
6 | 6 | ||
diff --git a/meta/conf/machine/include/tune-iwmmxt.inc b/meta/conf/machine/include/tune-iwmmxt.inc index 8376faca74..49e560ea1a 100644 --- a/meta/conf/machine/include/tune-iwmmxt.inc +++ b/meta/conf/machine/include/tune-iwmmxt.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | # Configurations for the Intel PXA27x Appications Processor Family. | 1 | # Configurations for the Intel PXA27x Appications Processor Family. |
2 | # Please use tune-xscale for PXA255/PXA26x based processors. | 2 | # Please use tune-xscale for PXA255/PXA26x based processors. |
3 | TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt" | 3 | TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt" |
4 | PACKAGE_ARCH = "iwmmxt" | 4 | BASE_PACKAGE_ARCH = "iwmmxt" |
5 | PACKAGE_EXTRA_ARCHS += "iwmmxt" | 5 | PACKAGE_EXTRA_ARCHS += "iwmmxt" |
6 | 6 | ||
diff --git a/meta/conf/machine/include/tune-ppc603e.inc b/meta/conf/machine/include/tune-ppc603e.inc index 1a004d30b5..a4a68d60e3 100644 --- a/meta/conf/machine/include/tune-ppc603e.inc +++ b/meta/conf/machine/include/tune-ppc603e.inc | |||
@@ -1,2 +1,2 @@ | |||
1 | TARGET_CC_ARCH = "-mcpu=603e -mhard-float" | 1 | TARGET_CC_ARCH = "-mcpu=603e -mhard-float" |
2 | PACKAGE_ARCH = "ppc603e" | 2 | BASE_PACKAGE_ARCH = "ppc603e" |
diff --git a/meta/conf/machine/include/tune-ppce500.inc b/meta/conf/machine/include/tune-ppce500.inc index 11717eba70..2482196424 100644 --- a/meta/conf/machine/include/tune-ppce500.inc +++ b/meta/conf/machine/include/tune-ppce500.inc | |||
@@ -1,2 +1,2 @@ | |||
1 | TARGET_CC_ARCH = "-mcpu=8540" | 1 | TARGET_CC_ARCH = "-mcpu=8540" |
2 | PACKAGE_ARCH = "ppce500" | 2 | BASE_PACKAGE_ARCH = "ppce500" |
diff --git a/meta/conf/machine/include/tune-supersparc.inc b/meta/conf/machine/include/tune-supersparc.inc index 1b1ec1207f..10133c6c21 100644 --- a/meta/conf/machine/include/tune-supersparc.inc +++ b/meta/conf/machine/include/tune-supersparc.inc | |||
@@ -1,2 +1,2 @@ | |||
1 | TARGET_CC_ARCH = "-mcpu=supersparc" | 1 | TARGET_CC_ARCH = "-mcpu=supersparc" |
2 | PACKAGE_ARCH = "supersparc" | 2 | BASE_PACKAGE_ARCH = "supersparc" |
diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc index 4cb0b4f7c3..fc6827c532 100644 --- a/meta/conf/machine/include/tune-xscale.inc +++ b/meta/conf/machine/include/tune-xscale.inc | |||
@@ -2,7 +2,7 @@ FEED_ARCH = "armv5te" | |||
2 | 2 | ||
3 | TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" | 3 | TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" |
4 | TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" | 4 | TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" |
5 | PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" | 5 | BASE_PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" |
6 | 6 | ||
7 | # webkit-gtk has alignment issues with double instructions on armv5 so | 7 | # webkit-gtk has alignment issues with double instructions on armv5 so |
8 | # disable them here | 8 | # disable them here |