diff options
| -rw-r--r-- | conf/layer.conf | 2 | ||||
| -rw-r--r-- | conf/machine/include/tune-corei7-common.inc | 4 | ||||
| -rw-r--r-- | conf/machine/qemu-x86.conf | 2 |
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" |