aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaveen Saini <naveen.kumar.saini@intel.com>2021-08-23 13:29:56 +0800
committerNaveen Saini <naveen.kumar.saini@intel.com>2021-08-24 09:25:37 +0800
commita021a1ab4ece92e00871dfc8871dc846e17e60d7 (patch)
tree775eb0ac8819ff6b5bc5d615e5075fa55dd7bafd
parentb2365dddc6f2ad44a3a5be677c514d584d3f4161 (diff)
downloadmeta-zephyr-a021a1ab4ece92e00871dfc8871dc846e17e60d7.tar.gz
meta-zephyr-a021a1ab4ece92e00871dfc8871dc846e17e60d7.tar.bz2
meta-zephyr-a021a1ab4ece92e00871dfc8871dc846e17e60d7.zip
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>
-rw-r--r--conf/layer.conf2
-rw-r--r--conf/machine/include/tune-corei7-common.inc4
-rw-r--r--conf/machine/qemu-x86.conf2
3 files changed, 5 insertions, 3 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 5f13c27..35f1075 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -16,3 +16,5 @@ LAYERVERSION_zephyr = "1"
LAYERDEPENDS_zephyr = "core meta-python"
LAYERSERIES_COMPAT_zephyr = "dunfell gatesgarth hardknott honister"
+
+X86_TUNE_DIR = "${@bb.utils.contains('LAYERSERIES_CORENAMES', 'honister', 'include/x86', 'include', d)}"
diff --git a/conf/machine/include/tune-corei7-common.inc b/conf/machine/include/tune-corei7-common.inc
index 509d190..b68fc05 100644
--- a/conf/machine/include/tune-corei7-common.inc
+++ b/conf/machine/include/tune-corei7-common.inc
@@ -1,6 +1,6 @@
DEFAULTTUNE ?= "corei7-64"
-require conf/machine/include/tune-corei7.inc
-require conf/machine/include/x86-base.inc
+require conf/machine/${X86_TUNE_DIR}/tune-corei7.inc
+require conf/machine/${X86_TUNE_DIR}/x86-base.inc
# Add x86 to MACHINEOVERRIDE
MACHINEOVERRIDES =. "x86:"
diff --git a/conf/machine/qemu-x86.conf b/conf/machine/qemu-x86.conf
index 31ce80d..ae7716c 100644
--- a/conf/machine/qemu-x86.conf
+++ b/conf/machine/qemu-x86.conf
@@ -3,7 +3,7 @@
#@DESCRIPTION: Machine for Zephyr BOARD qemu_x86
require conf/machine/include/qemu.inc
-require conf/machine/include/tune-i586.inc
+require conf/machine/${X86_TUNE_DIR}/tune-i586.inc
ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot"