From c5b670e4c9f020ed951d5499a888c50b1d703b62 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 2 Oct 2012 17:22:00 +0000 Subject: arm/arch-arm*: define ARMPKGARCH_tune-* for default tunes * tune-foo is not valid override, for it to work I had to add ARMPKGARCH = "${ARMPKGARCH_tune-${DEFAULTTUNE}}" but that doesn't work without value defined for every supported DEFAULTTUNE value, otherwise it's expanded like this TUNE_PKGARCH (${ARMPKGARCH_tune-armv5te}te). (From OE-Core rev: 31e4f2dee990ee7f5d7491b65565e71d7d580209) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/conf/machine/include/arm/arch-armv6.inc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'meta/conf/machine/include/arm/arch-armv6.inc') diff --git a/meta/conf/machine/include/arm/arch-armv6.inc b/meta/conf/machine/include/arm/arch-armv6.inc index f0fee93d3f..451a008e3e 100644 --- a/meta/conf/machine/include/arm/arch-armv6.inc +++ b/meta/conf/machine/include/arm/arch-armv6.inc @@ -1,7 +1,5 @@ DEFAULTTUNE ?= "armv6" -ARMPKGARCH ?= "armv6" - TUNEVALID[armv6] = "Enable instructions for ARMv6" TUNECONFLICTS[armv6] = "armv4 armv5" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv6", "-march=armv6", "", d)}" @@ -11,6 +9,10 @@ require conf/machine/include/arm/arch-armv5-dsp.inc # Little Endian AVAILTUNES += "armv6 armv6t armv6hf armv6thf" +ARMPKGARCH_tune-armv6 ?= "armv6" +ARMPKGARCH_tune-armv6t ?= "armv6" +ARMPKGARCH_tune-armv6hf ?= "armv6" +ARMPKGARCH_tune-armv6thf ?= "armv6" TUNE_FEATURES_tune-armv6 ?= "armv6 vfp" TUNE_FEATURES_tune-armv6t ?= "armv6 vfp thumb" TUNE_FEATURES_tune-armv6hf ?= "${TUNE_FEATURES_tune-armv6} callconvention-hard" @@ -22,6 +24,10 @@ PACKAGE_EXTRA_ARCHS_tune-armv6thf = "${PACKAGE_EXTRA_ARCHS_tune-armv5tehf-vfp} a # Big Endian AVAILTUNES += "armv6b armv6tb armv6hfb armv6thfb" +ARMPKGARCH_tune-armv6b ?= "armv6" +ARMPKGARCH_tune-armv6tb ?= "armv6" +ARMPKGARCH_tune-armv6hfb ?= "armv6" +ARMPKGARCH_tune-armv6thfb ?= "armv6" TUNE_FEATURES_tune-armv6b ?= "${TUNE_FEATURES_tune-armv6} bigendian" TUNE_FEATURES_tune-armv6tb ?= "${TUNE_FEATURES_tune-armv6t} bigendian" TUNE_FEATURES_tune-armv6hfb ?= "${TUNE_FEATURES_tune-armv6b} callconvention-hard" -- cgit v1.2.3-54-g00ecf