diff options
Diffstat (limited to 'conf')
-rw-r--r-- | conf/include/maintainers.inc | 91 | ||||
-rw-r--r-- | conf/layer.conf | 13 | ||||
-rw-r--r-- | conf/machine/include/intel-common-pkgarch.inc | 26 | ||||
-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/meta-intel.inc | 29 | ||||
-rw-r--r-- | conf/machine/include/qemu-intel.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/qemuboot-intel.inc | 25 | ||||
-rw-r--r-- | conf/machine/include/tune-skylake.inc | 48 | ||||
-rw-r--r-- | conf/machine/intel-core2-32.conf | 5 | ||||
-rw-r--r-- | conf/machine/intel-corei7-64.conf | 10 | ||||
-rw-r--r-- | conf/machine/intel-skylake-64.conf | 9 |
12 files changed, 103 insertions, 163 deletions
diff --git a/conf/include/maintainers.inc b/conf/include/maintainers.inc index 90c39e4e..3403b6b6 100644 --- a/conf/include/maintainers.inc +++ b/conf/include/maintainers.inc | |||
@@ -1,44 +1,51 @@ | |||
1 | # This file contains a list of recipe maintainers for meta-intel | 1 | # This file contains a list of recipe maintainers for meta-intel |
2 | 2 | ||
3 | RECIPE_MAINTAINER_pn-backport-iwlwifi = "Naveen Saini <naveen.kumar.saini@intel.com>" | 3 | RECIPE_MAINTAINER:pn-backport-iwlwifi = "Naveen Saini <naveen.kumar.saini@intel.com>" |
4 | RECIPE_MAINTAINER_pn-core-image-rt = "Anuj Mittal <anuj.mittal@intel.com>" | 4 | RECIPE_MAINTAINER:pn-core-image-rt = "Anuj Mittal <anuj.mittal@intel.com>" |
5 | RECIPE_MAINTAINER_pn-core-image-rt-sdk = "Anuj Mittal <anuj.mittal@intel.com>" | 5 | RECIPE_MAINTAINER:pn-core-image-rt-sdk = "Anuj Mittal <anuj.mittal@intel.com>" |
6 | RECIPE_MAINTAINER_pn-core-image-tiny = "Naveen Saini <naveen.kumar.saini@intel.com>" | 6 | RECIPE_MAINTAINER:pn-core-image-tiny = "Naveen Saini <naveen.kumar.saini@intel.com>" |
7 | RECIPE_MAINTAINER_pn-core-image-minimal-initramfs = "Anuj Mittal <anuj.mittal@intel.com>" | 7 | RECIPE_MAINTAINER:pn-core-image-minimal-initramfs = "Anuj Mittal <anuj.mittal@intel.com>" |
8 | RECIPE_MAINTAINER_pn-gmmlib = "Anuj Mittal <anuj.mittal@intel.com>" | 8 | RECIPE_MAINTAINER:pn-embree = "Naveen Saini <naveen.kumar.saini@intel.com>" |
9 | RECIPE_MAINTAINER_pn-hdcp = "Naveen Saini <naveen.kumar.saini@intel.com>" | 9 | RECIPE_MAINTAINER:pn-gmmlib = "Lim Siew Hoon <siew.hoon.lim@intel.com>" |
10 | RECIPE_MAINTAINER_pn-intel-graphics-compiler = "Naveen Saini <naveen.kumar.saini@intel.com>" | 10 | RECIPE_MAINTAINER:pn-hdcp = "Naveen Saini <naveen.kumar.saini@intel.com>" |
11 | RECIPE_MAINTAINER_pn-intel-compute-runtime = "Naveen Saini <naveen.kumar.saini@intel.com>" | 11 | RECIPE_MAINTAINER:pn-intel-cmt-cat = "Naveen Saini <naveen.kumar.saini@intel.com>" |
12 | RECIPE_MAINTAINER_pn-intel-media-driver = "Anuj Mittal <anuj.mittal@intel.com>" | 12 | RECIPE_MAINTAINER:pn-intel-compute-runtime = "Naveen Saini <naveen.kumar.saini@intel.com>" |
13 | RECIPE_MAINTAINER_pn-intel-mediasdk = "Anuj Mittal <anuj.mittal@intel.com>" | 13 | RECIPE_MAINTAINER:pn-intel-crypto-mb = "Anuj Mittal <anuj.mittal@intel.com>" |
14 | RECIPE_MAINTAINER_pn-intel-microcode = "Anuj Mittal <anuj.mittal@intel.com>" | 14 | RECIPE_MAINTAINER:pn-intel-graphics-compiler = "Naveen Saini <naveen.kumar.saini@intel.com>" |
15 | RECIPE_MAINTAINER_pn-intel-vaapi-driver = "Anuj Mittal <anuj.mittal@intel.com>" | 15 | RECIPE_MAINTAINER:pn-intel-media-driver = "Lim Siew Hoon <siew.hoon.lim@intel.com>" |
16 | RECIPE_MAINTAINER_pn-isa-l = "Naveen Saini <naveen.kumar.saini@intel.com>" | 16 | RECIPE_MAINTAINER:pn-intel-mediasdk = "Lim Siew Hoon <siew.hoon.lim@intel.com>" |
17 | RECIPE_MAINTAINER_pn-itt = "Naveen Saini <naveen.kumar.saini@intel.com>" | 17 | RECIPE_MAINTAINER:pn-intel-microcode = "Anuj Mittal <anuj.mittal@intel.com>" |
18 | RECIPE_MAINTAINER_pn-ixgbe = "Naveen Saini <naveen.kumar.saini@intel.com>" | 18 | RECIPE_MAINTAINER:pn-intel-vaapi-driver = "Lim Siew Hoon <siew.hoon.lim@intel.com>" |
19 | RECIPE_MAINTAINER_pn-ixgbevf = "Naveen Saini <naveen.kumar.saini@intel.com>" | 19 | RECIPE_MAINTAINER:pn-ipmctl = "Anuj Mittal <anuj.mittal@intel.com>" |
20 | RECIPE_MAINTAINER_pn-iucode-tool = "Anuj Mittal <anuj.mittal@intel.com>" | 20 | RECIPE_MAINTAINER:pn-isa-l = "Naveen Saini <naveen.kumar.saini@intel.com>" |
21 | RECIPE_MAINTAINER_pn-jhi = "Naveen Saini <naveen.kumar.saini@intel.com>" | 21 | RECIPE_MAINTAINER:pn-ispc = "Naveen Saini <naveen.kumar.saini@intel.com>" |
22 | RECIPE_MAINTAINER_pn-level-zero = "Naveen Saini <naveen.kumar.saini@intel.com>" | 22 | RECIPE_MAINTAINER:pn-itt = "Naveen Saini <naveen.kumar.saini@intel.com>" |
23 | RECIPE_MAINTAINER_pn-libipt = "Naveen Saini <naveen.kumar.saini@intel.com>" | 23 | RECIPE_MAINTAINER:pn-ixgbe = "Naveen Saini <naveen.kumar.saini@intel.com>" |
24 | RECIPE_MAINTAINER_pn-libyami = "Anuj Mittal <anuj.mittal@intel.com>" | 24 | RECIPE_MAINTAINER:pn-ixgbevf = "Naveen Saini <naveen.kumar.saini@intel.com>" |
25 | RECIPE_MAINTAINER_pn-libyami-utils = "Anuj Mittal <anuj.mittal@intel.com>" | 25 | RECIPE_MAINTAINER:pn-iucode-tool = "Anuj Mittal <anuj.mittal@intel.com>" |
26 | RECIPE_MAINTAINER_pn-libxcam = "Naveen Saini <naveen.kumar.saini@intel.com>" | 26 | RECIPE_MAINTAINER:pn-level-zero = "Naveen Saini <naveen.kumar.saini@intel.com>" |
27 | RECIPE_MAINTAINER_pn-linux-intel = "Anuj Mittal <anuj.mittal@intel.com>" | 27 | RECIPE_MAINTAINER:pn-libipt = "Naveen Saini <naveen.kumar.saini@intel.com>" |
28 | RECIPE_MAINTAINER_pn-linux-intel-rt = "Anuj Mittal <anuj.mittal@intel.com>" | 28 | RECIPE_MAINTAINER:pn-libva-intel = "Anuj Mittal <anuj.mittal@intel.com>" |
29 | RECIPE_MAINTAINER_pn-linux-intel-dev = "Naveen Saini <naveen.kumar.saini@intel.com>" | 29 | RECIPE_MAINTAINER:pn-libva-intel-utils = "Anuj Mittal <anuj.mittal@intel.com>" |
30 | RECIPE_MAINTAINER_pn-lms = "Anuj Mittal <anuj.mittal@intel.com>" | 30 | RECIPE_MAINTAINER:pn-libxcam = "Naveen Saini <naveen.kumar.saini@intel.com>" |
31 | RECIPE_MAINTAINER_pn-metee = "Naveen Saini <naveen.kumar.saini@intel.com>" | 31 | RECIPE_MAINTAINER:pn-linux-intel = "Anuj Mittal <anuj.mittal@intel.com>" |
32 | RECIPE_MAINTAINER_pn-metrics-discovery = "Naveen Saini <naveen.kumar.saini@intel.com>" | 32 | RECIPE_MAINTAINER:pn-linux-intel-rt = "Anuj Mittal <anuj.mittal@intel.com>" |
33 | RECIPE_MAINTAINER_pn-onednn = "Naveen Saini <naveen.kumar.saini@intel.com>" | 33 | RECIPE_MAINTAINER:pn-linux-intel-dev = "Naveen Saini <naveen.kumar.saini@intel.com>" |
34 | RECIPE_MAINTAINER_pn-open-model-zoo = "Anuj Mittal <anuj.mittal@intel.com>" | 34 | RECIPE_MAINTAINER:pn-linux-npu-driver = "Naveen Saini <naveen.kumar.saini@intel.com>" |
35 | RECIPE_MAINTAINER_pn-opencl-clang = "Naveen Saini <naveen.kumar.saini@intel.com>" | 35 | RECIPE_MAINTAINER:pn-lms = "Anuj Mittal <anuj.mittal@intel.com>" |
36 | RECIPE_MAINTAINER_pn-openvino-inference-engine = "Anuj Mittal <anuj.mittal@intel.com>" | 36 | RECIPE_MAINTAINER:pn-metee = "Naveen Saini <naveen.kumar.saini@intel.com>" |
37 | RECIPE_MAINTAINER_pn-openvino-model-optimizer = "Anuj Mittal <anuj.mittal@intel.com>" | 37 | RECIPE_MAINTAINER:pn-metrics-discovery = "Naveen Saini <naveen.kumar.saini@intel.com>" |
38 | RECIPE_MAINTAINER_pn-ovmf-shell-image-enrollkeys = "Naveen Saini <naveen.kumar.saini@intel.com>" | 38 | RECIPE_MAINTAINER:pn-oidn = "Naveen Saini <naveen.kumar.saini@intel.com>" |
39 | RECIPE_MAINTAINER_pn-sbsigntool-native = "Anuj Mittal <anuj.mittal@intel.com>" | 39 | RECIPE_MAINTAINER:pn-onednn = "Naveen Saini <naveen.kumar.saini@intel.com>" |
40 | RECIPE_MAINTAINER_pn-secureboot-selftest-image-signed = "Anuj Mittal <anuj.mittal@intel.com>" | 40 | RECIPE_MAINTAINER:pn-onedpl = "Naveen Saini <naveen.kumar.saini@intel.com>" |
41 | RECIPE_MAINTAINER_pn-secureboot-selftest-image-unsigned = "Anuj Mittal <anuj.mittal@intel.com>" | 41 | RECIPE_MAINTAINER:pn-onevpl = "Naveen Saini <naveen.kumar.saini@intel.com>" |
42 | RECIPE_MAINTAINER_pn-thermald = "Anuj Mittal <anuj.mittal@intel.com>" | 42 | RECIPE_MAINTAINER:pn-onevpl-intel-gpu = "Yew Chang Ching <chang.ching.yew@intel.com>" |
43 | RECIPE_MAINTAINER_pn-xf86-video-ast = "Anuj Mittal <anuj.mittal@intel.com>" | 43 | RECIPE_MAINTAINER:pn-open-model-zoo = "Anuj Mittal <anuj.mittal@intel.com>" |
44 | RECIPE_MAINTAINER_pn-zlib-intel = "Naveen Saini <naveen.kumar.saini@intel.com>" | 44 | RECIPE_MAINTAINER:pn-opencl-clang = "Naveen Saini <naveen.kumar.saini@intel.com>" |
45 | RECIPE_MAINTAINER:pn-openvino-inference-engine = "Anuj Mittal <anuj.mittal@intel.com>" | ||
46 | RECIPE_MAINTAINER:pn-openvino-model-optimizer = "Anuj Mittal <anuj.mittal@intel.com>" | ||
47 | RECIPE_MAINTAINER:pn-openvkl = "Naveen Saini <naveen.kumar.saini@intel.com>" | ||
48 | RECIPE_MAINTAINER:pn-ospray = "Naveen Saini <naveen.kumar.saini@intel.com>" | ||
49 | RECIPE_MAINTAINER:pn-rkcommon = "Naveen Saini <naveen.kumar.saini@intel.com>" | ||
50 | RECIPE_MAINTAINER:pn-thermald = "Anuj Mittal <anuj.mittal@intel.com>" | ||
51 | RECIPE_MAINTAINER:pn-xf86-video-ast = "Anuj Mittal <anuj.mittal@intel.com>" | ||
diff --git a/conf/layer.conf b/conf/layer.conf index c4781ffd..ebd2f732 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
@@ -10,15 +10,16 @@ BBFILE_PATTERN_intel := "^${LAYERDIR}/" | |||
10 | BBFILE_PRIORITY_intel = "5" | 10 | BBFILE_PRIORITY_intel = "5" |
11 | 11 | ||
12 | # Additional license directories. | 12 | # Additional license directories. |
13 | LICENSE_PATH += "${LAYERDIR}/custom-licenses" | 13 | CUSTOM_LICENSES_PATH = "${LAYERDIR}/custom-licenses" |
14 | LICENSE_PATH += "${CUSTOM_LICENSES_PATH}" | ||
14 | 15 | ||
15 | LAYERDEPENDS_intel = "core" | 16 | LAYERDEPENDS_intel = "core" |
16 | LAYERRECOMMENDS_intel = "dpdk intel-qat" | 17 | LAYERRECOMMENDS_intel = "dpdk" |
17 | 18 | ||
18 | # This should only be incremented on significant changes that will | 19 | # This should only be incremented on significant changes that will |
19 | # cause compatibility issues with other layers | 20 | # cause compatibility issues with other layers |
20 | LAYERVERSION_intel = "5" | 21 | LAYERVERSION_intel = "5" |
21 | LAYERSERIES_COMPAT_intel = "dunfell gatesgarth hardknott" | 22 | LAYERSERIES_COMPAT_intel = "scarthgap styhead" |
22 | 23 | ||
23 | BBFILES_DYNAMIC += " \ | 24 | BBFILES_DYNAMIC += " \ |
24 | clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bb \ | 25 | clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/*/*/*.bb \ |
@@ -31,10 +32,6 @@ BBFILES_DYNAMIC += " \ | |||
31 | 32 | ||
32 | require ${LAYERDIR}/conf/include/maintainers.inc | 33 | require ${LAYERDIR}/conf/include/maintainers.inc |
33 | 34 | ||
34 | PREFERRED_PROVIDER_zlib ?= "zlib" | ||
35 | PREFERRED_PROVIDER_zlib-native ?= "zlib-native" | ||
36 | PREFERRED_PROVIDER_nativesdk-zlib ?= "nativesdk-zlib" | ||
37 | |||
38 | # Use the libva from OE-Core when layer is included but no MACHINE | 35 | # Use the libva from OE-Core when layer is included but no MACHINE |
39 | # from meta-intel is being used. | 36 | # from meta-intel is being used. |
40 | PREFERRED_PROVIDER_libva ?= "libva" | 37 | PREFERRED_PROVIDER_libva ?= "libva" |
@@ -44,3 +41,5 @@ PREFERRED_PROVIDER_nativesdk-libva ?= "nativesdk-libva" | |||
44 | PREFERRED_PROVIDER_libva-utils ?= "libva-utils" | 41 | PREFERRED_PROVIDER_libva-utils ?= "libva-utils" |
45 | PREFERRED_PROVIDER_libva-utils-native ?= "libva-utils-native" | 42 | PREFERRED_PROVIDER_libva-utils-native ?= "libva-utils-native" |
46 | PREFERRED_PROVIDER_nativesdk-libva-utils ?= "nativesdk-libva-utils" | 43 | PREFERRED_PROVIDER_nativesdk-libva-utils ?= "nativesdk-libva-utils" |
44 | |||
45 | addpylib ${LAYERDIR}/lib oeqa | ||
diff --git a/conf/machine/include/intel-common-pkgarch.inc b/conf/machine/include/intel-common-pkgarch.inc index d0f208bd..94d77e06 100644 --- a/conf/machine/include/intel-common-pkgarch.inc +++ b/conf/machine/include/intel-common-pkgarch.inc | |||
@@ -1,15 +1,15 @@ | |||
1 | INTEL_COMMON_PACKAGE_ARCH ?= "${TUNE_PKGARCH}-intel-common" | 1 | INTEL_COMMON_PACKAGE_ARCH ?= "${TUNE_PKGARCH}-intel-common" |
2 | PACKAGE_ARCH_pn-linux-intel = "${INTEL_COMMON_PACKAGE_ARCH}" | 2 | PACKAGE_ARCH:pn-linux-intel = "${INTEL_COMMON_PACKAGE_ARCH}" |
3 | PACKAGE_ARCH_pn-linux-intel-rt = "${INTEL_COMMON_PACKAGE_ARCH}" | 3 | PACKAGE_ARCH:pn-linux-intel-rt = "${INTEL_COMMON_PACKAGE_ARCH}" |
4 | PACKAGE_ARCH_pn-linux-intel-tiny = "${INTEL_COMMON_PACKAGE_ARCH}" | 4 | PACKAGE_ARCH:pn-linux-intel-tiny = "${INTEL_COMMON_PACKAGE_ARCH}" |
5 | PACKAGE_ARCH_pn-linux-intel-dev = "${INTEL_COMMON_PACKAGE_ARCH}" | 5 | PACKAGE_ARCH:pn-linux-intel-dev = "${INTEL_COMMON_PACKAGE_ARCH}" |
6 | PACKAGE_ARCH_pn-linux-yocto = "${INTEL_COMMON_PACKAGE_ARCH}" | 6 | PACKAGE_ARCH:pn-linux-yocto = "${INTEL_COMMON_PACKAGE_ARCH}" |
7 | PACKAGE_ARCH_pn-linux-yocto-rt = "${INTEL_COMMON_PACKAGE_ARCH}" | 7 | PACKAGE_ARCH:pn-linux-yocto-rt = "${INTEL_COMMON_PACKAGE_ARCH}" |
8 | PACKAGE_ARCH_pn-linux-yocto-tiny = "${INTEL_COMMON_PACKAGE_ARCH}" | 8 | PACKAGE_ARCH:pn-linux-yocto-tiny = "${INTEL_COMMON_PACKAGE_ARCH}" |
9 | PACKAGE_ARCH_pn-linux-yocto-dev = "${INTEL_COMMON_PACKAGE_ARCH}" | 9 | PACKAGE_ARCH:pn-linux-yocto-dev = "${INTEL_COMMON_PACKAGE_ARCH}" |
10 | PACKAGE_ARCH_pn-intel-microcode = "${INTEL_COMMON_PACKAGE_ARCH}" | 10 | PACKAGE_ARCH:pn-intel-microcode = "${INTEL_COMMON_PACKAGE_ARCH}" |
11 | PACKAGE_ARCH_pn-backport-iwlwifi = "${INTEL_COMMON_PACKAGE_ARCH}" | 11 | PACKAGE_ARCH:pn-backport-iwlwifi = "${INTEL_COMMON_PACKAGE_ARCH}" |
12 | PACKAGE_ARCH_pn-ixgbe = "${INTEL_COMMON_PACKAGE_ARCH}" | 12 | PACKAGE_ARCH:pn-ixgbe = "${INTEL_COMMON_PACKAGE_ARCH}" |
13 | PACKAGE_ARCH_pn-ixgbevf = "${INTEL_COMMON_PACKAGE_ARCH}" | 13 | PACKAGE_ARCH:pn-ixgbevf = "${INTEL_COMMON_PACKAGE_ARCH}" |
14 | PACKAGE_EXTRA_ARCHS_append += "${INTEL_COMMON_PACKAGE_ARCH}" | 14 | PACKAGE_EXTRA_ARCHS:append = " ${INTEL_COMMON_PACKAGE_ARCH}" |
15 | MACHINEOVERRIDES =. "${INTEL_COMMON_PACKAGE_ARCH}:" | 15 | MACHINEOVERRIDES =. "${INTEL_COMMON_PACKAGE_ARCH}:" |
diff --git a/conf/machine/include/intel-core2-32-common.inc b/conf/machine/include/intel-core2-32-common.inc index 8c469499..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/include/tune-core2.inc | 6 | require conf/machine/include/x86/tune-core2.inc |
7 | require conf/machine/include/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 00282569..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/include/tune-corei7.inc | 6 | require conf/machine/include/x86/tune-corei7.inc |
7 | require conf/machine/include/x86-base.inc | 7 | require conf/machine/include/x86/x86-base.inc |
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc index 19f7857d..c780094f 100644 --- a/conf/machine/include/meta-intel.inc +++ b/conf/machine/include/meta-intel.inc | |||
@@ -5,17 +5,11 @@ | |||
5 | # | 5 | # |
6 | 6 | ||
7 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel" | 7 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel" |
8 | PREFERRED_PROVIDER_virtual/kernel_poky-tiny ?= "linux-intel" | 8 | PREFERRED_PROVIDER_virtual/kernel:poky-tiny ?= "linux-intel" |
9 | 9 | ||
10 | # Only use the Intel-tuned zlib for target builds to improve reuse | 10 | PREFERRED_VERSION_linux-intel ?= "6.6%" |
11 | PREFERRED_PROVIDER_zlib = "zlib-intel" | 11 | PREFERRED_VERSION_linux-intel-rt ?= "6.6%" |
12 | PREFERRED_PROVIDER_zlib-native = "zlib-native" | 12 | PREFERRED_VERSION_linux-intel:poky-altcfg ?= "6.8%" |
13 | PREFERRED_PROVIDER_nativesdk-zlib = "nativesdk-zlib" | ||
14 | |||
15 | PREFERRED_VERSION_linux-intel ?= "5.10%" | ||
16 | PREFERRED_VERSION_linux-intel-rt ?= "5.10%" | ||
17 | PREFERRED_VERSION_linux-intel_poky-altcfg ?= "5.4%" | ||
18 | PREFERRED_VERSION_linux-intel-rt_poky-altcfg ?= "5.4%" | ||
19 | 13 | ||
20 | # Need to point to latest version of libva needed for media components | 14 | # Need to point to latest version of libva needed for media components |
21 | PREFERRED_PROVIDER_libva = "libva-intel" | 15 | PREFERRED_PROVIDER_libva = "libva-intel" |
@@ -26,29 +20,24 @@ PREFERRED_PROVIDER_libva-utils = "libva-intel-utils" | |||
26 | PREFERRED_PROVIDER_libva-utils-native = "libva-intel-utils-native" | 20 | PREFERRED_PROVIDER_libva-utils-native = "libva-intel-utils-native" |
27 | PREFERRED_PROVIDER_nativesdk-libva-utils = "nativesdk-libva-intel-utils" | 21 | PREFERRED_PROVIDER_nativesdk-libva-utils = "nativesdk-libva-intel-utils" |
28 | 22 | ||
29 | PREFERRED_VERSION_opencl-clang ?= "${@bb.utils.contains('LLVMVERSION', '10.0.1', '10.0.0', \ | ||
30 | bb.utils.contains('LLVMVERSION', '11.1.0', '11.0.0', '12.0.0', d), d)}" | ||
31 | PREFERRED_VERSION_opencl-clang-native ?= "${@bb.utils.contains('LLVMVERSION', '10.0.1', '10.0.0', \ | ||
32 | bb.utils.contains('LLVMVERSION', '11.1.0', '11.0.0', '12.0.0', d), d)}" | ||
33 | |||
34 | XSERVER_X86_ASPEED_AST = "xf86-video-ast \ | 23 | XSERVER_X86_ASPEED_AST = "xf86-video-ast \ |
35 | " | 24 | " |
36 | 25 | ||
37 | # include the user space intel microcode loading support in the generated images. | 26 | # include the user space intel microcode loading support in the generated images. |
38 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', ' intel-microcode', '', d)}" | 27 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', ' intel-microcode', '', d)}" |
39 | 28 | ||
40 | # recommended extra packages common to all intel machines | 29 | # recommended extra packages common to all intel machines |
41 | MACHINE_EXTRA_RRECOMMENDS_append = " kernel-modules linux-firmware" | 30 | MACHINE_EXTRA_RRECOMMENDS:append = " kernel-modules linux-firmware" |
42 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kernel-module-i915 linux-firmware-i915" | 31 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS:append = " kernel-module-i915 linux-firmware-i915 kernel-module-igc kernel-module-r8152" |
43 | 32 | ||
44 | # for the early boot time kernel microcode loading support, | 33 | # for the early boot time kernel microcode loading support, |
45 | # merge the microcode data in the final initrd image. | 34 | # merge the microcode data in the final initrd image. |
46 | INITRD_LIVE_prepend = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}" | 35 | INITRD_LIVE:prepend = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}" |
47 | 36 | ||
48 | DISK_SIGNATURE_UUID ??= "deadbeef-dead-beef-dead-beefdeadbeef" | 37 | DISK_SIGNATURE_UUID ??= "deadbeef-dead-beef-dead-beefdeadbeef" |
49 | 38 | ||
50 | EFI_PROVIDER ?= "systemd-boot" | 39 | EFI_PROVIDER ?= "systemd-boot" |
51 | EFI_PROVIDER_x86-x32 = "grub-efi" | 40 | EFI_PROVIDER:x86-x32 = "grub-efi" |
52 | 41 | ||
53 | # Add general MACHINEOVERRIDE for meta-intel | 42 | # Add general MACHINEOVERRIDE for meta-intel |
54 | MACHINEOVERRIDES =. "intel-x86-common:" | 43 | MACHINEOVERRIDES =. "intel-x86-common:" |
diff --git a/conf/machine/include/qemu-intel.inc b/conf/machine/include/qemu-intel.inc index 81510404..4608db99 100644 --- a/conf/machine/include/qemu-intel.inc +++ b/conf/machine/include/qemu-intel.inc | |||
@@ -2,7 +2,7 @@ | |||
2 | # distro content (in particular the kernel) less than qemu.inc. | 2 | # distro content (in particular the kernel) less than qemu.inc. |
3 | 3 | ||
4 | # Ensure that qemu gets built when building images. | 4 | # Ensure that qemu gets built when building images. |
5 | EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" | 5 | EXTRA_IMAGEDEPENDS += "qemu-system-native qemu-helper-native:do_addto_recipe_sysroot" |
6 | 6 | ||
7 | # Build ovmf firmware for uefi support in qemu. | 7 | # Build ovmf firmware for uefi support in qemu. |
8 | EXTRA_IMAGEDEPENDS += "ovmf" | 8 | EXTRA_IMAGEDEPENDS += "ovmf" |
diff --git a/conf/machine/include/qemuboot-intel.inc b/conf/machine/include/qemuboot-intel.inc index befcc250..17a1234d 100644 --- a/conf/machine/include/qemuboot-intel.inc +++ b/conf/machine/include/qemuboot-intel.inc | |||
@@ -1,19 +1,18 @@ | |||
1 | # For runqemu | 1 | # For runqemu |
2 | IMAGE_CLASSES += "qemuboot" | 2 | IMAGE_CLASSES += "qemuboot" |
3 | QB_SYSTEM_NAME_intel-core2-32 = "qemu-system-i386" | 3 | QB_SYSTEM_NAME:intel-core2-32 = "qemu-system-i386" |
4 | QB_CPU_intel-core2-32 = "-cpu coreduo" | 4 | QB_CPU:intel-core2-32 = "-cpu coreduo" |
5 | QB_CPU_KVM_intel-core2-32 = "-cpu kvm32" | 5 | QB_CPU_KVM:intel-core2-32 = "-cpu kvm32" |
6 | 6 | ||
7 | QB_SYSTEM_NAME_intel-corei7-64 = "qemu-system-x86_64" | 7 | QB_SYSTEM_NAME:intel-corei7-64 = "qemu-system-x86_64" |
8 | QB_CPU_intel-corei7-64 = "-cpu Nehalem" | 8 | QB_CPU:intel-corei7-64 = "-cpu Nehalem" |
9 | QB_CPU_KVM_intel-corei7-64 = "-cpu kvm64" | 9 | QB_CPU_KVM:intel-corei7-64 = "-cpu kvm64" |
10 | 10 | ||
11 | QB_SYSTEM_NAME_intel-skylake-64 = "qemu-system-x86_64" | 11 | QB_SYSTEM_NAME:intel-skylake-64 = "qemu-system-x86_64" |
12 | QB_CPU_intel-skylake-64 = "-cpu Skylake-Client" | 12 | QB_CPU:intel-skylake-64 = "-cpu Skylake-Client" |
13 | QB_CPU_KVM_intel-skylake-64 = "-cpu Skylake-Client" | 13 | QB_CPU_KVM:intel-skylake-64 = "-cpu Skylake-Client" |
14 | 14 | ||
15 | QB_AUDIO_DRV = "alsa" | 15 | QB_AUDIO_DRV = "alsa" |
16 | QB_AUDIO_OPT = "-soundhw ac97,es1370" | 16 | QB_AUDIO_OPT = "-device AC97" |
17 | QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1 uvesafb.task_timeout=-1" | 17 | QB_KERNEL_CMDLINE_APPEND = " oprofile.timer=1" |
18 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 18 | QB_OPT_APPEND = " -usb -usbdevice tablet " |
19 | QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci" | ||
diff --git a/conf/machine/include/tune-skylake.inc b/conf/machine/include/tune-skylake.inc deleted file mode 100644 index 4882600b..00000000 --- a/conf/machine/include/tune-skylake.inc +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | # Settings for the GCC(1) cpu-type "skylake": | ||
2 | # | ||
3 | # Intel Skylake CPU with 64-bit extensions, MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, | ||
4 | # SSE4.2, AVX, AVX2 and POPCNT instruction set support. | ||
5 | # | ||
6 | # This tune is recommended for Intel Skylake CPU (and beyond). | ||
7 | # | ||
8 | DEFAULTTUNE ?= "skylake-64" | ||
9 | |||
10 | # Include the previous tune to pull in PACKAGE_EXTRA_ARCHS | ||
11 | require conf/machine/include/tune-corei7.inc | ||
12 | |||
13 | # Extra tune features | ||
14 | TUNEVALID[skylake] = "Enable skylake specific processor optimizations" | ||
15 | TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'skylake', ' -march=skylake ${SKYLAKE_TUNE} -mfpmath=sse', '', d)}" | ||
16 | |||
17 | # Extra tune selections | ||
18 | |||
19 | AVAILTUNES += "skylake-64" | ||
20 | TUNE_FEATURES_tune-skylake-64 = "${TUNE_FEATURES_tune-x86-64} skylake" | ||
21 | BASE_LIB_tune-skylake-64 = "lib64" | ||
22 | TUNE_PKGARCH_tune-skylake-64 = "skylake-64" | ||
23 | PACKAGE_EXTRA_ARCHS_tune-skylake-64 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64} skylake-64" | ||
24 | QEMU_EXTRAOPTIONS_skylake-64 = " -cpu Skylake-Client" | ||
25 | |||
26 | |||
27 | # Disable QEMU usermode by default (get avx2) | ||
28 | MACHINE_FEATURES_remove = "qemu-usermode" | ||
29 | |||
30 | # If qemu-usermode is enabled, we have to disable avx2 ISA extensions, but we can keep mtune as skylake vs generic | ||
31 | SKYLAKE_TUNE .= "${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', ' -mtune=skylake ${QEMU_UNAVAILABLE_ISA}', '-mtune=generic -mavx2', d)}" | ||
32 | |||
33 | QEMU_UNAVAILABLE_ISA = " \ | ||
34 | -mno-avx \ | ||
35 | -mno-avx2 \ | ||
36 | -mno-avx512f \ | ||
37 | -mno-avx512er \ | ||
38 | -mno-avx512cd \ | ||
39 | -mno-avx512pf \ | ||
40 | -mno-avx512dq \ | ||
41 | -mno-avx512bw \ | ||
42 | -mno-avx512vl \ | ||
43 | -mno-avx512ifma \ | ||
44 | -mno-avx512vbmi \ | ||
45 | -mno-avx512vbmi2 \ | ||
46 | -mno-avx512vnni \ | ||
47 | -mno-avx512bitalg \ | ||
48 | " | ||
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index 384ad1e9..5b134dc3 100644 --- a/conf/machine/intel-core2-32.conf +++ b/conf/machine/intel-core2-32.conf | |||
@@ -13,9 +13,6 @@ MACHINE_FEATURES += "intel-ucode" | |||
13 | 13 | ||
14 | MACHINE_HWCODECS ?= "intel-vaapi-driver gstreamer1.0-vaapi" | 14 | MACHINE_HWCODECS ?= "intel-vaapi-driver gstreamer1.0-vaapi" |
15 | 15 | ||
16 | # Enable optional QAT items: | ||
17 | COMPATIBLE_MACHINE_pn-qat17 = "intel-core2-32" | ||
18 | |||
19 | XSERVER ?= "${XSERVER_X86_BASE} \ | 16 | XSERVER ?= "${XSERVER_X86_BASE} \ |
20 | ${XSERVER_X86_EXT} \ | 17 | ${XSERVER_X86_EXT} \ |
21 | ${XSERVER_X86_FBDEV} \ | 18 | ${XSERVER_X86_FBDEV} \ |
@@ -32,4 +29,4 @@ APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0" | |||
32 | 29 | ||
33 | IMAGE_FSTYPES += "wic" | 30 | IMAGE_FSTYPES += "wic" |
34 | WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks.in", "grub-bootdisk-microcode.wks.in", d)}" | 31 | WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks.in", "grub-bootdisk-microcode.wks.in", d)}" |
35 | WKS_FILE_DEPENDS_append = " intel-microcode" | 32 | WKS_FILE_DEPENDS:append = " intel-microcode" |
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index 033b1aa9..968395fe 100644 --- a/conf/machine/intel-corei7-64.conf +++ b/conf/machine/intel-corei7-64.conf | |||
@@ -14,12 +14,8 @@ MACHINE_FEATURES += "intel-ucode" | |||
14 | MACHINE_HWCODECS ?= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'intel-media-driver intel-mediasdk', d)} gstreamer1.0-vaapi" | 14 | MACHINE_HWCODECS ?= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'intel-media-driver intel-mediasdk', d)} gstreamer1.0-vaapi" |
15 | 15 | ||
16 | # Enable optional dpdk: | 16 | # Enable optional dpdk: |
17 | COMPATIBLE_MACHINE_pn-dpdk = "intel-corei7-64" | 17 | COMPATIBLE_MACHINE:pn-dpdk = "intel-corei7-64" |
18 | 18 | COMPATIBLE_MACHINE:pn-dpdk-module = "intel-corei7-64" | |
19 | # Enable optional QAT items: | ||
20 | COMPATIBLE_MACHINE_pn-qat16 = "intel-corei7-64" | ||
21 | COMPATIBLE_MACHINE_pn-qat17 = "intel-corei7-64" | ||
22 | COMPATIBLE_MACHINE_pn-zlib-qat = "intel-corei7-64" | ||
23 | 19 | ||
24 | XSERVER ?= "${XSERVER_X86_BASE} \ | 20 | XSERVER ?= "${XSERVER_X86_BASE} \ |
25 | ${XSERVER_X86_EXT} \ | 21 | ${XSERVER_X86_EXT} \ |
@@ -37,4 +33,4 @@ APPEND += "rootwait console=ttyS0,115200 console=tty0" | |||
37 | 33 | ||
38 | IMAGE_FSTYPES += "wic" | 34 | IMAGE_FSTYPES += "wic" |
39 | WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks.in", "grub-bootdisk-microcode.wks.in", d)}" | 35 | WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks.in", "grub-bootdisk-microcode.wks.in", d)}" |
40 | WKS_FILE_DEPENDS_append = " intel-microcode" | 36 | WKS_FILE_DEPENDS:append = " intel-microcode" |
diff --git a/conf/machine/intel-skylake-64.conf b/conf/machine/intel-skylake-64.conf index eccd59b8..a2b392c2 100644 --- a/conf/machine/intel-skylake-64.conf +++ b/conf/machine/intel-skylake-64.conf | |||
@@ -4,8 +4,8 @@ | |||
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/include/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/x86/tune-x86-64-v3.inc |
9 | require conf/machine/include/intel-common-pkgarch.inc | 9 | require conf/machine/include/intel-common-pkgarch.inc |
10 | 10 | ||
11 | MACHINE_FEATURES += "efi" | 11 | MACHINE_FEATURES += "efi" |
@@ -14,7 +14,8 @@ MACHINE_FEATURES += "intel-ucode" | |||
14 | 14 | ||
15 | MACHINE_HWCODECS ?= "intel-media-driver intel-mediasdk gstreamer1.0-vaapi" | 15 | MACHINE_HWCODECS ?= "intel-media-driver intel-mediasdk gstreamer1.0-vaapi" |
16 | 16 | ||
17 | COMPATIBLE_MACHINE_pn-dpdk = "intel-skylake-64" | 17 | COMPATIBLE_MACHINE:pn-dpdk = "intel-skylake-64" |
18 | COMPATIBLE_MACHINE:pn-dpdk-module = "intel-skylake-64" | ||
18 | 19 | ||
19 | XSERVER ?= "${XSERVER_X86_BASE} \ | 20 | XSERVER ?= "${XSERVER_X86_BASE} \ |
20 | ${XSERVER_X86_EXT} \ | 21 | ${XSERVER_X86_EXT} \ |
@@ -32,4 +33,4 @@ APPEND += "rootwait console=ttyS0,115200 console=tty0" | |||
32 | 33 | ||
33 | IMAGE_FSTYPES += "wic" | 34 | IMAGE_FSTYPES += "wic" |
34 | WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks.in", "grub-bootdisk-microcode.wks.in", d)}" | 35 | WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks.in", "grub-bootdisk-microcode.wks.in", d)}" |
35 | WKS_FILE_DEPENDS_append = " intel-microcode" | 36 | WKS_FILE_DEPENDS:append = " intel-microcode" |