diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-12-09 17:46:07 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-07 13:40:18 +0000 |
commit | 9280a8ea614b09437b386d335b7f44055ba9ac7b (patch) | |
tree | bff79eb25ed928bfddebe2ab2c87a1dd562ef467 /meta/conf/machine/include | |
parent | 46d6b0ea468bb9f3fea9854cba7308345fe3aa90 (diff) | |
download | poky-9280a8ea614b09437b386d335b7f44055ba9ac7b.tar.gz |
arch-armv5.inc: drop duplicate ARMPKGSFX_DSP and PACKAGE_EXTRA_ARCHS_tune-armv5tehf-vfp
* both belong and already are in arch-armv5-dsp.inc
(From OE-Core rev: 791f52d3b58ce1fd4bfd159deb83a1917d6267f2)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine/include')
-rw-r--r-- | meta/conf/machine/include/arm/arch-armv5.inc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/meta/conf/machine/include/arm/arch-armv5.inc b/meta/conf/machine/include/arm/arch-armv5.inc index 6a1797293a..e6ff902a95 100644 --- a/meta/conf/machine/include/arm/arch-armv5.inc +++ b/meta/conf/machine/include/arm/arch-armv5.inc | |||
@@ -5,8 +5,6 @@ TUNECONFLICTS[armv5] = "armv4" | |||
5 | TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'armv5', ' -march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}', '', d)}" | 5 | TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'armv5', ' -march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}', '', d)}" |
6 | MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv5', 'armv5:', '' ,d)}" | 6 | MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv5', 'armv5:', '' ,d)}" |
7 | 7 | ||
8 | ARMPKGSFX_DSP = "${@bb.utils.contains('TUNE_FEATURES', [ 'armv5', 'dsp' ], 'e', '', d)}" | ||
9 | |||
10 | require conf/machine/include/arm/arch-armv4.inc | 8 | require conf/machine/include/arm/arch-armv4.inc |
11 | require conf/machine/include/arm/feature-arm-vfp.inc | 9 | require conf/machine/include/arm/feature-arm-vfp.inc |
12 | 10 | ||
@@ -33,7 +31,6 @@ PACKAGE_EXTRA_ARCHS_tune-armv5-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5} arm | |||
33 | PACKAGE_EXTRA_ARCHS_tune-armv5t-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5t} armv5-vfp armv5t-vfp" | 31 | PACKAGE_EXTRA_ARCHS_tune-armv5t-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5t} armv5-vfp armv5t-vfp" |
34 | PACKAGE_EXTRA_ARCHS_tune-armv5hf-vfp = "armv5hf-vfp" | 32 | PACKAGE_EXTRA_ARCHS_tune-armv5hf-vfp = "armv5hf-vfp" |
35 | PACKAGE_EXTRA_ARCHS_tune-armv5thf-vfp = "armv5hf-vfp armv5thf-vfp" | 33 | PACKAGE_EXTRA_ARCHS_tune-armv5thf-vfp = "armv5hf-vfp armv5thf-vfp" |
36 | PACKAGE_EXTRA_ARCHS_tune-armv5tehf-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5thf-vfp} armv5ehf-vfp armv5tehf-vfp" | ||
37 | 34 | ||
38 | # Big Endian | 35 | # Big Endian |
39 | AVAILTUNES += "armv5b armv5tb" | 36 | AVAILTUNES += "armv5b armv5tb" |