summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/documentation.conf3
-rw-r--r--meta/conf/machine/include/README4
-rw-r--r--meta/conf/machine/include/arm/arch-armv5-dsp.inc1
-rw-r--r--meta/conf/machine/include/arm/arch-armv7a.inc2
-rw-r--r--meta/conf/machine/include/ia32/arch-ia32.inc2
-rw-r--r--meta/conf/machine/include/mips/arch-mips.inc6
-rw-r--r--meta/conf/machine/include/tune-c3.inc2
7 files changed, 14 insertions, 6 deletions
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index f4d62418c6..3e40a77a40 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -34,6 +34,9 @@ TARGET_CC_ARCH[doc] = "FIXME"
34TARGET_FPU[doc] = "Floating point option (mostly for FPU-less systems), can be 'soft' or empty \ 34TARGET_FPU[doc] = "Floating point option (mostly for FPU-less systems), can be 'soft' or empty \
35for hardware floating point instructions." 35for hardware floating point instructions."
36 36
37TUNEVALID[doc] = "Descriptions of valid tuning features, stored as flags."
38TUNECONFLICTS[doc] = "List of conflicting features for a given feature."
39
37ASSUME_PROVIDED[doc] = "List of packages (recipes actually) which are assumed to be implicitly available.\ 40ASSUME_PROVIDED[doc] = "List of packages (recipes actually) which are assumed to be implicitly available.\
38 These packages won't be built by bitbake." 41 These packages won't be built by bitbake."
39ASSUME_SHLIBS[doc] = "List of shlib:package[_version] mappings. Useful for lib packages in ASSUME_PROVIDED,\ 42ASSUME_SHLIBS[doc] = "List of shlib:package[_version] mappings. Useful for lib packages in ASSUME_PROVIDED,\
diff --git a/meta/conf/machine/include/README b/meta/conf/machine/include/README
index 6a3a63dbca..e4b59c9566 100644
--- a/meta/conf/machine/include/README
+++ b/meta/conf/machine/include/README
@@ -24,6 +24,10 @@ TUNEVALID[feature] - The <feature> is defined with a human readable
24explanation for what it does. All architectural, cpu, abi, etc tuning 24explanation for what it does. All architectural, cpu, abi, etc tuning
25features must be defined using TUNEVALID. 25features must be defined using TUNEVALID.
26 26
27TUNECONFLICTS[feature] - A list of features which conflict with <feature>.
28New sanity checks will try to reject combinations in which a single
29tuning ends up with features which conflict with each other.
30
27TUNE_FEATURES - This is automatically defined as TUNE_FEATURES_tune-<tune>. 31TUNE_FEATURES - This is automatically defined as TUNE_FEATURES_tune-<tune>.
28See TUNE_FEATURES_tune-<tune> for more information. 32See TUNE_FEATURES_tune-<tune> for more information.
29 33
diff --git a/meta/conf/machine/include/arm/arch-armv5-dsp.inc b/meta/conf/machine/include/arm/arch-armv5-dsp.inc
index 9f03a0fd76..0f64562f4b 100644
--- a/meta/conf/machine/include/arm/arch-armv5-dsp.inc
+++ b/meta/conf/machine/include/arm/arch-armv5-dsp.inc
@@ -1,4 +1,5 @@
1ARMPKGSFX_DSP = "${@bb.utils.contains("TUNE_FEATURES", [ "armv5", "dsp" ], "e", "", d)}" 1ARMPKGSFX_DSP = "${@bb.utils.contains("TUNE_FEATURES", [ "armv5", "dsp" ], "e", "", d)}"
2TUNEVALID[dsp] = "ARM DSP functionality"
2 3
3require conf/machine/include/arm/arch-armv5.inc 4require conf/machine/include/arm/arch-armv5.inc
4 5
diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc
index 629960d2da..c90aff5ae8 100644
--- a/meta/conf/machine/include/arm/arch-armv7a.inc
+++ b/meta/conf/machine/include/arm/arch-armv7a.inc
@@ -2,7 +2,7 @@ DEFAULTTUNE ?= "armv7a"
2 2
3ARMPKGARCH ?= "armv7a" 3ARMPKGARCH ?= "armv7a"
4 4
5TUNEVALID[armv7-a] = "Enable instructions for ARMv7-a" 5TUNEVALID[armv7a] = "Enable instructions for ARMv7-a"
6TUNE_CONFLICTS[armv7a] = "armv4 armv5 armv6 armv7" 6TUNE_CONFLICTS[armv7a] = "armv4 armv5 armv6 armv7"
7TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "-march=armv7-a -fno-tree-vectorize", "", d)}" 7TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "-march=armv7-a -fno-tree-vectorize", "", d)}"
8MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7a", ":armv7a", "" ,d)}" 8MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7a", ":armv7a", "" ,d)}"
diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc b/meta/conf/machine/include/ia32/arch-ia32.inc
index a5dae8811b..15f67d7c62 100644
--- a/meta/conf/machine/include/ia32/arch-ia32.inc
+++ b/meta/conf/machine/include/ia32/arch-ia32.inc
@@ -27,7 +27,7 @@ TUNE_ASARGS += "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-x32", "", d)}"
27 27
28# ELF64 ABI 28# ELF64 ABI
29TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI" 29TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI"
30TUNECONFLICT[m64] = "m32 mx32" 30TUNECONFLICTS[m64] = "m32 mx32"
31TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m64", "${X86ARCH64}", "" ,d)}" 31TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m64", "${X86ARCH64}", "" ,d)}"
32TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}" 32TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
33 33
diff --git a/meta/conf/machine/include/mips/arch-mips.inc b/meta/conf/machine/include/mips/arch-mips.inc
index 8758ecd714..9f12920848 100644
--- a/meta/conf/machine/include/mips/arch-mips.inc
+++ b/meta/conf/machine/include/mips/arch-mips.inc
@@ -12,15 +12,15 @@ TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "-meb", "-mel
12 12
13# ABI flags 13# ABI flags
14TUNEVALID[o32] = "MIPS o32 ABI" 14TUNEVALID[o32] = "MIPS o32 ABI"
15TUNECONFLICT[o32] = "n32 n64" 15TUNECONFLICTS[o32] = "n32 n64"
16TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "o32", "-mabi=32", "", d)}" 16TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "o32", "-mabi=32", "", d)}"
17 17
18TUNEVALID[n32] = "MIPS64 n32 ABI" 18TUNEVALID[n32] = "MIPS64 n32 ABI"
19TUNECONFLICT[n32] = "o32 n64" 19TUNECONFLICTS[n32] = "o32 n64"
20TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "n32", "-mabi=n32", "", d)}" 20TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "n32", "-mabi=n32", "", d)}"
21 21
22TUNEVALID[n64] = "MIPS64 n64 ABI" 22TUNEVALID[n64] = "MIPS64 n64 ABI"
23TUNECONFLICT[n64] = "o32 n32" 23TUNECONFLICTS[n64] = "o32 n32"
24TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "n64", "-mabi=64", "", d)}" 24TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "n64", "-mabi=64", "", d)}"
25 25
26# Floating point 26# Floating point
diff --git a/meta/conf/machine/include/tune-c3.inc b/meta/conf/machine/include/tune-c3.inc
index 06fac8fb17..79bb67b450 100644
--- a/meta/conf/machine/include/tune-c3.inc
+++ b/meta/conf/machine/include/tune-c3.inc
@@ -1,7 +1,7 @@
1require conf/machine/include/ia32/arch-ia32.inc 1require conf/machine/include/ia32/arch-ia32.inc
2 2
3TUNEVALID[c3] = "VIA Cyrix III or VIA C3 specific optimizations" 3TUNEVALID[c3] = "VIA Cyrix III or VIA C3 specific optimizations"
4TUNECONFLICT[c3] = "m64 mx32" 4TUNECONFLICTS[c3] = "m64 mx32"
5TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "c3", "-march=c3 -mtune=c3", "", d)}" 5TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "c3", "-march=c3 -mtune=c3", "", d)}"
6 6
7AVAILTUNES += "c3" 7AVAILTUNES += "c3"