diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2022-04-05 10:25:35 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2022-04-05 15:59:12 +0800 |
commit | 7bb49b1ae15ab04b352edb58e97927f75846c9b0 (patch) | |
tree | 907e1d31b82a1929aa816393ce217d31c06a7a29 /conf | |
parent | 8c995eac09d4ecb82f8aa15690fe74748d153456 (diff) | |
download | meta-intel-7bb49b1ae15ab04b352edb58e97927f75846c9b0.tar.gz |
conf: remove usage of X86_TUNE_DIR var
The main branch only supports building with kirkstone now so we no
longer need this to tweak paths for older branches.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/layer.conf | 2 | ||||
-rw-r--r-- | conf/machine/include/intel-core2-32-common.inc | 4 | ||||
-rw-r--r-- | conf/machine/include/intel-corei7-64-common.inc | 4 | ||||
-rw-r--r-- | conf/machine/include/tune-skylake.inc | 2 | ||||
-rw-r--r-- | conf/machine/intel-skylake-64.conf | 2 |
5 files changed, 6 insertions, 8 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index b81d891c..64e209b6 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
@@ -41,5 +41,3 @@ PREFERRED_PROVIDER_nativesdk-libva ?= "nativesdk-libva" | |||
41 | PREFERRED_PROVIDER_libva-utils ?= "libva-utils" | 41 | PREFERRED_PROVIDER_libva-utils ?= "libva-utils" |
42 | PREFERRED_PROVIDER_libva-utils-native ?= "libva-utils-native" | 42 | PREFERRED_PROVIDER_libva-utils-native ?= "libva-utils-native" |
43 | PREFERRED_PROVIDER_nativesdk-libva-utils ?= "nativesdk-libva-utils" | 43 | PREFERRED_PROVIDER_nativesdk-libva-utils ?= "nativesdk-libva-utils" |
44 | |||
45 | X86_TUNE_DIR = "${@bb.utils.contains_any('LAYERSERIES_CORENAMES', 'honister kirkstone', 'include/x86', 'include', d)}" | ||
diff --git a/conf/machine/include/intel-core2-32-common.inc b/conf/machine/include/intel-core2-32-common.inc index 20d50207..ce34d9bb 100644 --- a/conf/machine/include/intel-core2-32-common.inc +++ b/conf/machine/include/intel-core2-32-common.inc | |||
@@ -3,5 +3,5 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | DEFAULTTUNE ?= "core2-32" | 5 | DEFAULTTUNE ?= "core2-32" |
6 | require conf/machine/${X86_TUNE_DIR}/tune-core2.inc | 6 | require conf/machine/include/x86/tune-core2.inc |
7 | require conf/machine/${X86_TUNE_DIR}/x86-base.inc | 7 | require conf/machine/include/x86/x86-base.inc |
diff --git a/conf/machine/include/intel-corei7-64-common.inc b/conf/machine/include/intel-corei7-64-common.inc index 82645eb3..3498ebe3 100644 --- a/conf/machine/include/intel-corei7-64-common.inc +++ b/conf/machine/include/intel-corei7-64-common.inc | |||
@@ -3,5 +3,5 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | DEFAULTTUNE ?= "corei7-64" | 5 | DEFAULTTUNE ?= "corei7-64" |
6 | require conf/machine/${X86_TUNE_DIR}/tune-corei7.inc | 6 | require conf/machine/include/x86/tune-corei7.inc |
7 | require conf/machine/${X86_TUNE_DIR}/x86-base.inc | 7 | require conf/machine/include/x86/x86-base.inc |
diff --git a/conf/machine/include/tune-skylake.inc b/conf/machine/include/tune-skylake.inc index b3630edd..05b7283c 100644 --- a/conf/machine/include/tune-skylake.inc +++ b/conf/machine/include/tune-skylake.inc | |||
@@ -8,7 +8,7 @@ | |||
8 | DEFAULTTUNE ?= "skylake-64" | 8 | DEFAULTTUNE ?= "skylake-64" |
9 | 9 | ||
10 | # Include the previous tune to pull in PACKAGE_EXTRA_ARCHS | 10 | # Include the previous tune to pull in PACKAGE_EXTRA_ARCHS |
11 | require conf/machine/${X86_TUNE_DIR}/tune-corei7.inc | 11 | require conf/machine/include/x86/tune-corei7.inc |
12 | 12 | ||
13 | # Extra tune features | 13 | # Extra tune features |
14 | TUNEVALID[skylake] = "Enable skylake specific processor optimizations" | 14 | TUNEVALID[skylake] = "Enable skylake specific processor optimizations" |
diff --git a/conf/machine/intel-skylake-64.conf b/conf/machine/intel-skylake-64.conf index 84dee4bb..47d53fa0 100644 --- a/conf/machine/intel-skylake-64.conf +++ b/conf/machine/intel-skylake-64.conf | |||
@@ -4,7 +4,7 @@ | |||
4 | #@DESCRIPTION: Machine configuration for 64 bit Intel Skylake CPU (and later) with MMX, SSE, SSE2, SSE3, SSE4.1, SSE4.2, AVX, and AVX2 instruction set support. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. | 4 | #@DESCRIPTION: Machine configuration for 64 bit Intel Skylake CPU (and later) with MMX, SSE, SSE2, SSE3, SSE4.1, SSE4.2, AVX, and AVX2 instruction set support. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. |
5 | 5 | ||
6 | require conf/machine/include/meta-intel.inc | 6 | require conf/machine/include/meta-intel.inc |
7 | require conf/machine/${X86_TUNE_DIR}/x86-base.inc | 7 | require conf/machine/include/x86/x86-base.inc |
8 | require conf/machine/include/tune-skylake.inc | 8 | require conf/machine/include/tune-skylake.inc |
9 | require conf/machine/include/intel-common-pkgarch.inc | 9 | require conf/machine/include/intel-common-pkgarch.inc |
10 | 10 | ||