summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorNaveen Saini <naveen.kumar.saini@intel.com>2021-08-23 15:57:34 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2021-08-23 23:45:22 +0800
commit3838f1d263aceef8f94c340593323b67391a26fa (patch)
tree3548e1989d679a4d1e8716b3479e4906fbcbc4f8 /conf
parent0567f4f7806ab0ab69abcf2c535d834a661a9666 (diff)
downloadmeta-intel-3838f1d263aceef8f94c340593323b67391a26fa.tar.gz
layer.conf: update machine confs with new tune locations
Added logic to make sure, it does not break with old releases. Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/layer.conf2
-rw-r--r--conf/machine/include/intel-core2-32-common.inc4
-rw-r--r--conf/machine/include/intel-corei7-64-common.inc4
-rw-r--r--conf/machine/include/tune-skylake.inc2
-rw-r--r--conf/machine/intel-skylake-64.conf2
5 files changed, 8 insertions, 6 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 884e0d4b..b48cf611 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -44,3 +44,5 @@ PREFERRED_PROVIDER_nativesdk-libva ?= "nativesdk-libva"
44PREFERRED_PROVIDER_libva-utils ?= "libva-utils" 44PREFERRED_PROVIDER_libva-utils ?= "libva-utils"
45PREFERRED_PROVIDER_libva-utils-native ?= "libva-utils-native" 45PREFERRED_PROVIDER_libva-utils-native ?= "libva-utils-native"
46PREFERRED_PROVIDER_nativesdk-libva-utils ?= "nativesdk-libva-utils" 46PREFERRED_PROVIDER_nativesdk-libva-utils ?= "nativesdk-libva-utils"
47
48X86_TUNE_DIR = "${@bb.utils.contains('LAYERSERIES_CORENAMES', 'honister', '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 8c469499..20d50207 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
5DEFAULTTUNE ?= "core2-32" 5DEFAULTTUNE ?= "core2-32"
6require conf/machine/include/tune-core2.inc 6require conf/machine/${X86_TUNE_DIR}/tune-core2.inc
7require conf/machine/include/x86-base.inc 7require conf/machine/${X86_TUNE_DIR}/x86-base.inc
diff --git a/conf/machine/include/intel-corei7-64-common.inc b/conf/machine/include/intel-corei7-64-common.inc
index 00282569..82645eb3 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
5DEFAULTTUNE ?= "corei7-64" 5DEFAULTTUNE ?= "corei7-64"
6require conf/machine/include/tune-corei7.inc 6require conf/machine/${X86_TUNE_DIR}/tune-corei7.inc
7require conf/machine/include/x86-base.inc 7require conf/machine/${X86_TUNE_DIR}/x86-base.inc
diff --git a/conf/machine/include/tune-skylake.inc b/conf/machine/include/tune-skylake.inc
index 29740121..b3630edd 100644
--- a/conf/machine/include/tune-skylake.inc
+++ b/conf/machine/include/tune-skylake.inc
@@ -8,7 +8,7 @@
8DEFAULTTUNE ?= "skylake-64" 8DEFAULTTUNE ?= "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
11require conf/machine/include/tune-corei7.inc 11require conf/machine/${X86_TUNE_DIR}/tune-corei7.inc
12 12
13# Extra tune features 13# Extra tune features
14TUNEVALID[skylake] = "Enable skylake specific processor optimizations" 14TUNEVALID[skylake] = "Enable skylake specific processor optimizations"
diff --git a/conf/machine/intel-skylake-64.conf b/conf/machine/intel-skylake-64.conf
index f1c4f5b2..81047385 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
6require conf/machine/include/meta-intel.inc 6require conf/machine/include/meta-intel.inc
7require conf/machine/include/x86-base.inc 7require conf/machine/${X86_TUNE_DIR}/x86-base.inc
8require conf/machine/include/tune-skylake.inc 8require conf/machine/include/tune-skylake.inc
9require conf/machine/include/intel-common-pkgarch.inc 9require conf/machine/include/intel-common-pkgarch.inc
10 10