mirror of
https://git.yoctoproject.org/poky
synced 2026-02-20 08:29:42 +01:00
88fa952b7c
OVERRIDES reads from left to right, least to most specific. We were appending to MACHINEOVERRIDES when we should have been prepending so the ordering of qemuall verses qemuxxx was incorrect, as was the x86 override and several of the arm overrides. This patch is a batch cleanup of the various issues to correct the order from least to most specific. The include order does matter and we needed to tweak some of that in this patch too. [YOCTO #4090] (From OE-Core rev: bdc1b214431c9c93a929b547b9a61e7b87fbd366) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
61 lines
3.1 KiB
PHP
61 lines
3.1 KiB
PHP
DEFAULTTUNE ?= "armv5"
|
|
|
|
TUNEVALID[armv5] = "Enable instructions for ARMv5"
|
|
TUNECONFLICTS[armv5] = "armv4"
|
|
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv5", "-march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}", "", d)}"
|
|
MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "armv5", "armv5:", "" ,d)}"
|
|
|
|
ARMPKGSFX_DSP = "${@bb.utils.contains("TUNE_FEATURES", [ "armv5", "dsp" ], "e", "", d)}"
|
|
|
|
require conf/machine/include/arm/arch-armv4.inc
|
|
require conf/machine/include/arm/feature-arm-vfp.inc
|
|
|
|
# Little Endian
|
|
AVAILTUNES += "armv5 armv5t"
|
|
ARMPKGARCH_tune-armv5 ?= "armv5"
|
|
ARMPKGARCH_tune-armv5t ?= "armv5"
|
|
TUNE_FEATURES_tune-armv5 ?= "armv5"
|
|
TUNE_FEATURES_tune-armv5t ?= "${TUNE_FEATURES_tune-armv5} thumb"
|
|
PACKAGE_EXTRA_ARCHS_tune-armv5 = "${PACKAGE_EXTRA_ARCHS_tune-armv4} armv5"
|
|
PACKAGE_EXTRA_ARCHS_tune-armv5t = "${PACKAGE_EXTRA_ARCHS_tune-armv4t} armv5 armv5t"
|
|
|
|
# Little Endian + VFP/DSP
|
|
AVAILTUNES += "armv5-vfp armv5t-vfp armv5hf-vfp armv5thf-vfp"
|
|
ARMPKGARCH_tune-armv5-vfp ?= "armv5"
|
|
ARMPKGARCH_tune-armv5t-vfp ?= "armv5"
|
|
ARMPKGARCH_tune-armv5hf-vfp ?= "armv5"
|
|
ARMPKGARCH_tune-armv5thf-vfp ?= "armv5"
|
|
TUNE_FEATURES_tune-armv5-vfp ?= "${TUNE_FEATURES_tune-armv5} vfp"
|
|
TUNE_FEATURES_tune-armv5t-vfp ?= "${TUNE_FEATURES_tune-armv5t} vfp"
|
|
TUNE_FEATURES_tune-armv5hf-vfp ?= "${TUNE_FEATURES_tune-armv5-vfp} callconvention-hard"
|
|
TUNE_FEATURES_tune-armv5thf-vfp ?= "${TUNE_FEATURES_tune-armv5t-vfp} callconvention-hard"
|
|
PACKAGE_EXTRA_ARCHS_tune-armv5-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5} armv5-vfp"
|
|
PACKAGE_EXTRA_ARCHS_tune-armv5t-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5t} armv5-vfp armv5t-vfp"
|
|
PACKAGE_EXTRA_ARCHS_tune-armv5hf-vfp = "armv5hf-vfp"
|
|
PACKAGE_EXTRA_ARCHS_tune-armv5thf-vfp = "armv5hf-vfp armv5thf-vfp"
|
|
PACKAGE_EXTRA_ARCHS_tune-armv5tehf-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5thf-vfp} armv5ehf-vfp armv5tehf-vfp"
|
|
|
|
# Big Endian
|
|
AVAILTUNES += "armv5b armv5tb"
|
|
ARMPKGARCH_tune-armv5b ?= "armv5"
|
|
ARMPKGARCH_tune-armv5tb ?= "armv5"
|
|
TUNE_FEATURES_tune-armv5b ?= "${TUNE_FEATURES_tune-armv5} bigendian"
|
|
TUNE_FEATURES_tune-armv5tb ?= "${TUNE_FEATURES_tune-armv5t} bigendian"
|
|
PACKAGE_EXTRA_ARCHS_tune-armv5b = "${PACKAGE_EXTRA_ARCHS_tune-armv4b} armv5b"
|
|
PACKAGE_EXTRA_ARCHS_tune-armv5tb = "${PACKAGE_EXTRA_ARCHS_tune-armv4tb} armv5b armv5tb"
|
|
|
|
# Big Endian + VFP/DSP
|
|
AVAILTUNES += "armv5b-vfp armv5tb-vfp armv5hfb-vfp armv5thfb-vfp"
|
|
ARMPKGARCH_tune-armv5b-vfp ?= "armv5"
|
|
ARMPKGARCH_tune-armv5tb-vfp ?= "armv5"
|
|
ARMPKGARCH_tune-armv5hfb-vfp ?= "armv5"
|
|
ARMPKGARCH_tune-armv5thfb-vfp ?= "armv5"
|
|
TUNE_FEATURES_tune-armv5b-vfp ?= "${TUNE_FEATURES_tune-armv5-vfp} bigendian"
|
|
TUNE_FEATURES_tune-armv5tb-vfp ?= "${TUNE_FEATURES_tune-armv5t-vfp} bigendian"
|
|
TUNE_FEATURES_tune-armv5hfb-vfp ?= "${TUNE_FEATURES_tune-armv5hf-vfp} bigendian"
|
|
TUNE_FEATURES_tune-armv5thfb-vfp ?= "${TUNE_FEATURES_tune-armv5thf-vfp} bigendian"
|
|
PACKAGE_EXTRA_ARCHS_tune-armv5b-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5b} armv5b-vfp"
|
|
PACKAGE_EXTRA_ARCHS_tune-armv5tb-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5tb} armv5b-vfp armv5tb-vfp"
|
|
PACKAGE_EXTRA_ARCHS_tune-armv5hfb-vfp = "armv5hfb-vfp"
|
|
PACKAGE_EXTRA_ARCHS_tune-armv5thfb-vfp = "armv5hfb-vfp armv5thfb-vfp"
|