diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2014-04-25 18:40:27 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-29 17:20:11 +0100 |
commit | d19e29a8e6c05bd8bf356a30fab1d24ec3402229 (patch) | |
tree | 62e4a82011c9b138a31eee89433394794e3cf72a /meta/conf/machine/include/arm/arch-armv4.inc | |
parent | af76e86126574fa80f9dbae27496795950dd7547 (diff) | |
download | poky-d19e29a8e6c05bd8bf356a30fab1d24ec3402229.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
(From OE-Core rev: 1250d3e009363d20f15bbfaced622c5912a7fb93)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine/include/arm/arch-armv4.inc')
-rw-r--r-- | meta/conf/machine/include/arm/arch-armv4.inc | 3 |
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 @@ | |||
1 | DEFAULTTUNE ?= "armv4" | 1 | DEFAULTTUNE ?= "armv4" |
2 | 2 | ||
3 | TUNEVALID[arm] = "Enable ARM instruction set" | ||
3 | TUNEVALID[armv4] = "Enable instructions for ARMv4" | 4 | TUNEVALID[armv4] = "Enable instructions for ARMv4" |
4 | TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "armv4", " -march=armv4${ARMPKGSFX_THUMB}", "", d)}" | 5 | TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "armv4", " -march=armv4${ARMPKGSFX_THUMB}", "", d)}" |
5 | # enable --fix-v4bx when we have armv4 in TUNE_FEATURES, but then disable it when we have also armv5 or thumb | 6 | # 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 | |||
18 | AVAILTUNES += "armv4 armv4t" | 19 | AVAILTUNES += "armv4 armv4t" |
19 | ARMPKGARCH_tune-armv4 ?= "armv4" | 20 | ARMPKGARCH_tune-armv4 ?= "armv4" |
20 | ARMPKGARCH_tune-armv4t ?= "armv4" | 21 | ARMPKGARCH_tune-armv4t ?= "armv4" |
21 | TUNE_FEATURES_tune-armv4 ?= "armv4" | 22 | TUNE_FEATURES_tune-armv4 ?= "arm armv4" |
22 | TUNE_FEATURES_tune-armv4t ?= "${TUNE_FEATURES_tune-armv4} thumb" | 23 | TUNE_FEATURES_tune-armv4t ?= "${TUNE_FEATURES_tune-armv4} thumb" |
23 | PACKAGE_EXTRA_ARCHS_tune-armv4 = "arm armv4" | 24 | PACKAGE_EXTRA_ARCHS_tune-armv4 = "arm armv4" |
24 | PACKAGE_EXTRA_ARCHS_tune-armv4t = "${PACKAGE_EXTRA_ARCHS_tune-armv4} armv4t" | 25 | PACKAGE_EXTRA_ARCHS_tune-armv4t = "${PACKAGE_EXTRA_ARCHS_tune-armv4} armv4t" |