From patchwork Sat Sep 22 16:51:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [RFC, 2/5] tune-xscale, tune-arm926ejs: add OPTDEFAULTTUNE variable and use more generic DEFAULTTUNE as default Date: Sat, 22 Sep 2012 16:51:14 -0000 From: Martin Jansa X-Patchwork-Id: 37059 Message-Id: <5ac0bc525f5ac3f07c5749efc31e91c3fe6145c1.1348330479.git.Martin.Jansa@gmail.com> To: openembedded-core@lists.openembedded.org * bitbake.conf has OPTDEFAULTTUNE with weak default value of DEFAULTTUNE * this way xscale or arm926ejs is not used by default when some machine includes its tune*.inc, but it's easy for DISTRO to say it wants OPTDEFAULTTUNE for some packages or always (if they don't want to share built packages between xscale and arm926ejs). Signed-off-by: Martin Jansa --- meta/conf/bitbake.conf | 1 + meta/conf/machine/include/tune-arm926ejs.inc | 3 ++- meta/conf/machine/include/tune-xscale.inc | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 9b41749..e433fcb 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -95,6 +95,7 @@ HOST_LD_ARCH = "${TARGET_LD_ARCH}" HOST_AS_ARCH = "${TARGET_AS_ARCH}" HOST_EXEEXT = "" +OPTDEFAULTTUNE ??= "${DEFAULTTUNE}" TUNE_ARCH ??= "INVALID" TUNE_CCARGS ??= "" TUNE_LDARGS ??= "" diff --git a/meta/conf/machine/include/tune-arm926ejs.inc b/meta/conf/machine/include/tune-arm926ejs.inc index c6e5289..4406b3c 100644 --- a/meta/conf/machine/include/tune-arm926ejs.inc +++ b/meta/conf/machine/include/tune-arm926ejs.inc @@ -1,4 +1,5 @@ -DEFAULTTUNE ?= "arm926ejs" +DEFAULTTUNE ?= "armv5te" +OPTDEFAULTTUNE ?= "arm926ejs" ARMPKGSFX_CPU = "${@bb.utils.contains("TUNE_FEATURES", "arm926ejs", "-arm926ejs", "", d)}" require conf/machine/include/arm/arch-armv5-dsp.inc diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc index 1f47c44..a04a5e1 100644 --- a/meta/conf/machine/include/tune-xscale.inc +++ b/meta/conf/machine/include/tune-xscale.inc @@ -1,4 +1,5 @@ -DEFAULTTUNE ?= "xscale" +DEFAULTTUNE ?= "armv5te" +OPTDEFAULTTUNE ?= "xscale" ARMPKGSFX_CPU = "${@bb.utils.contains("TUNE_FEATURES", "xscale", "-xscale", "", d)}" require conf/machine/include/arm/arch-armv5-dsp.inc