layer.conf: update machine confs with new tune locations
PATCH 1/1 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 <[email protected]>
--- conf/layer.conf | 2 ++ conf/machine/include/tune-corei7-common.inc | 4 ++-- conf/machine/qemu-x86.conf | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-)
conf/layer.conf +2 -0
@@ -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)}"
conf/machine/include/tune-corei7-common.inc +2 -2
@@ -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:"
conf/machine/qemu-x86.conf +1 -1
@@ -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"
Signature · 1 line
2.17.1