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-armv4.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/conf/machine/include/arm/arch-armv4.inc') diff --git a/meta/conf/machine/include/arm/arch-armv4.inc b/meta/conf/machine/include/arm/arch-armv4.inc index cb747acba6..07e8eec8a7 100644 --- a/meta/conf/machine/include/arm/arch-armv4.inc +++ b/meta/conf/machine/include/arm/arch-armv4.inc @@ -1,7 +1,5 @@ DEFAULTTUNE ?= "armv4" -ARMPKGARCH ?= "armv4" - TUNEVALID[armv4] = "Enable instructions for ARMv4" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv4", "-march=armv4${ARMPKGSFX_THUMB}", "", d)}" TARGET_LD_KERNEL_ARCH += "${@bb.utils.contains("TUNE_FEATURES", "armv4", "--fix-v4bx", "", d)}" @@ -12,6 +10,8 @@ require conf/machine/include/arm/feature-arm-thumb.inc # Little Endian AVAILTUNES += "armv4 armv4t" +ARMPKGARCH_tune-armv4 ?= "armv4" +ARMPKGARCH_tune-armv4t ?= "armv4" TUNE_FEATURES_tune-armv4 ?= "armv4" TUNE_FEATURES_tune-armv4t ?= "armv4 thumb" PACKAGE_EXTRA_ARCHS_tune-armv4 = "arm armv4" @@ -19,6 +19,8 @@ PACKAGE_EXTRA_ARCHS_tune-armv4t = "${PACKAGE_EXTRA_ARCHS_tune-armv4} armv4t" # Big Endian AVAILTUNES += "armv4b armv4tb" +ARMPKGARCH_tune-armv4b ?= "armv4" +ARMPKGARCH_tune-armv4tb ?= "armv4" TUNE_FEATURES_tune-armv4b ?= "${TUNE_FEATURES_tune-armv4} bigendian" TUNE_FEATURES_tune-armv4tb ?= "${TUNE_FEATURES_tune-armv4t} bigendian" PACKAGE_EXTRA_ARCHS_tune-armv4b = "armeb armv4b" -- cgit v1.2.3-54-g00ecf