summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/include/arm/arch-armv4.inc
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2014-04-25 18:40:27 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-29 17:19:49 +0100
commit1250d3e009363d20f15bbfaced622c5912a7fb93 (patch)
tree48e7ccf586b3e927e9336ebc1f8d2cd8342507fa /meta/conf/machine/include/arm/arch-armv4.inc
parent31a3525504ad7cf9fe0a4f8da27ad11e6311f299 (diff)
downloadopenembedded-core-contrib-1250d3e009363d20f15bbfaced622c5912a7fb93.tar.gz
feature-arm-thumb.inc, arch-armv4.inc: Add "arm" to TUNE_FEATURES
* it will be inherited by most DEFAULTTUNEs, except few exceptions which support only thumb and not arm * respect missing "arm" in TUNE_FEATURES in feature-arm-thumb.inc, so when recipe asks for "arm" and MACHINE supports only "thumb" ignore recipe and try to build with "thumb" * show warning when overriding ARM_INSTRUCTION_SET set by recipe from tune config Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/conf/machine/include/arm/arch-armv4.inc')
-rw-r--r--meta/conf/machine/include/arm/arch-armv4.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/machine/include/arm/arch-armv4.inc b/meta/conf/machine/include/arm/arch-armv4.inc
index c33c81690c..52c07a83cf 100644
--- a/meta/conf/machine/include/arm/arch-armv4.inc
+++ b/meta/conf/machine/include/arm/arch-armv4.inc
@@ -1,5 +1,6 @@
DEFAULTTUNE ?= "armv4"
+TUNEVALID[arm] = "Enable ARM instruction set"
TUNEVALID[armv4] = "Enable instructions for ARMv4"
TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "armv4", " -march=armv4${ARMPKGSFX_THUMB}", "", d)}"
# enable --fix-v4bx when we have armv4 in TUNE_FEATURES, but then disable it when we have also armv5 or thumb
@@ -18,7 +19,7 @@ require conf/machine/include/arm/feature-arm-thumb.inc
AVAILTUNES += "armv4 armv4t"
ARMPKGARCH_tune-armv4 ?= "armv4"
ARMPKGARCH_tune-armv4t ?= "armv4"
-TUNE_FEATURES_tune-armv4 ?= "armv4"
+TUNE_FEATURES_tune-armv4 ?= "arm armv4"
TUNE_FEATURES_tune-armv4t ?= "${TUNE_FEATURES_tune-armv4} thumb"
PACKAGE_EXTRA_ARCHS_tune-armv4 = "arm armv4"
PACKAGE_EXTRA_ARCHS_tune-armv4t = "${PACKAGE_EXTRA_ARCHS_tune-armv4} armv4t"