From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Tue, 11 Sep 2012 17:08:37 +0000 (+0200)
Subject: tune-*: add OPTDEFAULTTUNE variable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=034098fa71f824ac91e3d7d740543cba3e99ee6c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

tune-*: add OPTDEFAULTTUNE variable

* bitbake.conf has OPTDEFAULTTUNE with weak default value of DEFAULTTUNE
* this way distribution policy can set DEFAULTTUNE = OPTDEFAULTTUNE to
  build always with more specific tune (which includes -mtune
  parameter) without listing DEFAULTTUNEs for all MACHINEs supported by
  distribution.
* or it can set such tunes only for some packages
  DEFAULTTUNE_pn-foo = "${OPTDEFAULTTUNE}"
* or it can include meta/conf/distro/include/optimized-tune.inc which
  will be used to share knowledge which packages are worth building with
  specific -mtune

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 62a39367441..58863061d92 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -101,6 +101,7 @@ HOST_LD_ARCH = "${TARGET_LD_ARCH}"
 HOST_AS_ARCH = "${TARGET_AS_ARCH}"
 HOST_EXEEXT = ""
 
+OPTDEFAULTTUNE ??= "${DEFAULTTUNE}"
 TUNE_ARCH ??= "INVALID"
 TUNE_CCARGS ??= ""
 TUNE_CCARGS[vardepvalue] = "${TUNE_CCARGS}"
diff --git a/meta/conf/machine/include/tune-arm1136jf-s.inc b/meta/conf/machine/include/tune-arm1136jf-s.inc
index 4a131b64c39..b3cffd1422e 100644
--- a/meta/conf/machine/include/tune-arm1136jf-s.inc
+++ b/meta/conf/machine/include/tune-arm1136jf-s.inc
@@ -1,4 +1,5 @@
 DEFAULTTUNE ?= "armv6"
+OPTDEFAULTTUNE ?= "arm1136jfs"
 
 require conf/machine/include/arm/arch-armv6.inc
 
diff --git a/meta/conf/machine/include/tune-arm920t.inc b/meta/conf/machine/include/tune-arm920t.inc
index 5cadcc7dc3c..567517dd455 100644
--- a/meta/conf/machine/include/tune-arm920t.inc
+++ b/meta/conf/machine/include/tune-arm920t.inc
@@ -1,4 +1,5 @@
 DEFAULTTUNE ?= "armv4t"
+OPTDEFAULTTUNE ?= "arm920t"
 
 require conf/machine/include/arm/arch-armv4.inc
 
diff --git a/meta/conf/machine/include/tune-arm926ejs.inc b/meta/conf/machine/include/tune-arm926ejs.inc
index 335e4e020df..9952a2bafd9 100644
--- a/meta/conf/machine/include/tune-arm926ejs.inc
+++ b/meta/conf/machine/include/tune-arm926ejs.inc
@@ -1,4 +1,5 @@
 DEFAULTTUNE ?= "armv5te"
+OPTDEFAULTTUNE ?= "arm926ejs"
 
 require conf/machine/include/arm/arch-armv5-dsp.inc
 
diff --git a/meta/conf/machine/include/tune-arm9tdmi.inc b/meta/conf/machine/include/tune-arm9tdmi.inc
index dee57c98580..fd985690d00 100644
--- a/meta/conf/machine/include/tune-arm9tdmi.inc
+++ b/meta/conf/machine/include/tune-arm9tdmi.inc
@@ -1,4 +1,5 @@
 DEFAULTTUNE ?= "armv4t"
+OPTDEFAULTTUNE ?= "arm9tdmi"
 
 require conf/machine/include/arm/arch-armv4.inc
 
diff --git a/meta/conf/machine/include/tune-cortexa8.inc b/meta/conf/machine/include/tune-cortexa8.inc
index 771537ff84e..2d68054b441 100644
--- a/meta/conf/machine/include/tune-cortexa8.inc
+++ b/meta/conf/machine/include/tune-cortexa8.inc
@@ -1,4 +1,5 @@
 DEFAULTTUNE ?= "armv7a-neon"
+OPTDEFAULTTUNE ?= "cortexa8"
 
 require conf/machine/include/arm/arch-armv7a.inc
 
diff --git a/meta/conf/machine/include/tune-cortexa9.inc b/meta/conf/machine/include/tune-cortexa9.inc
index 700394b824f..586f030d4c9 100644
--- a/meta/conf/machine/include/tune-cortexa9.inc
+++ b/meta/conf/machine/include/tune-cortexa9.inc
@@ -1,4 +1,5 @@
 DEFAULTTUNE ?= "armv7a-neon"
+OPTDEFAULTTUNE ?= "cortexa9"
 
 require conf/machine/include/arm/arch-armv7a.inc
 
diff --git a/meta/conf/machine/include/tune-cortexm1.inc b/meta/conf/machine/include/tune-cortexm1.inc
index 3b652796d27..5475b032377 100644
--- a/meta/conf/machine/include/tune-cortexm1.inc
+++ b/meta/conf/machine/include/tune-cortexm1.inc
@@ -1,4 +1,5 @@
 DEFAULTTUNE ?= "armv7a"
+OPTDEFAULTTUNE ?= "cortexm1"
 
 require conf/machine/include/arm/arch-armv7a.inc
 
diff --git a/meta/conf/machine/include/tune-strongarm1100.inc b/meta/conf/machine/include/tune-strongarm1100.inc
index ea2fba89fe7..73a10a95ba9 100644
--- a/meta/conf/machine/include/tune-strongarm1100.inc
+++ b/meta/conf/machine/include/tune-strongarm1100.inc
@@ -1,4 +1,5 @@
 DEFAULTTUNE ?= "armv4"
+OPTDEFAULTTUNE ?= "strongarm"
 
 require conf/machine/include/arm/arch-armv4.inc
 
diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc
index 0c5ca8d1717..9a90479015a 100644
--- a/meta/conf/machine/include/tune-xscale.inc
+++ b/meta/conf/machine/include/tune-xscale.inc
@@ -1,4 +1,5 @@
 DEFAULTTUNE ?= "armv5te"
+OPTDEFAULTTUNE ?= "xscale"
 
 require conf/machine/include/arm/arch-armv5-dsp.inc