diff options
Diffstat (limited to 'conf')
-rw-r--r-- | conf/include/maintainers.inc | 104 | ||||
-rw-r--r-- | conf/machine/include/intel-common-pkgarch.inc | 26 | ||||
-rw-r--r-- | conf/machine/include/meta-intel.inc | 14 | ||||
-rw-r--r-- | conf/machine/include/tune-skylake.inc | 10 | ||||
-rw-r--r-- | conf/machine/intel-core2-32.conf | 2 | ||||
-rw-r--r-- | conf/machine/intel-corei7-64.conf | 4 | ||||
-rw-r--r-- | conf/machine/intel-skylake-64.conf | 4 |
7 files changed, 82 insertions, 82 deletions
diff --git a/conf/include/maintainers.inc b/conf/include/maintainers.inc index e23892f6..d23a0e99 100644 --- a/conf/include/maintainers.inc +++ b/conf/include/maintainers.inc | |||
@@ -1,54 +1,54 @@ | |||
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-embree = "Naveen Saini <naveen.kumar.saini@intel.com>" | 8 | RECIPE_MAINTAINER:pn-embree = "Naveen Saini <naveen.kumar.saini@intel.com>" |
9 | RECIPE_MAINTAINER_pn-gmmlib = "Lim Siew Hoon <siew.hoon.lim@intel.com>" | 9 | RECIPE_MAINTAINER:pn-gmmlib = "Lim Siew Hoon <siew.hoon.lim@intel.com>" |
10 | RECIPE_MAINTAINER_pn-hdcp = "Naveen Saini <naveen.kumar.saini@intel.com>" | 10 | RECIPE_MAINTAINER:pn-hdcp = "Naveen Saini <naveen.kumar.saini@intel.com>" |
11 | RECIPE_MAINTAINER_pn-intel-graphics-compiler = "Naveen Saini <naveen.kumar.saini@intel.com>" | 11 | RECIPE_MAINTAINER:pn-intel-graphics-compiler = "Naveen Saini <naveen.kumar.saini@intel.com>" |
12 | RECIPE_MAINTAINER_pn-intel-compute-runtime = "Naveen Saini <naveen.kumar.saini@intel.com>" | 12 | RECIPE_MAINTAINER:pn-intel-compute-runtime = "Naveen Saini <naveen.kumar.saini@intel.com>" |
13 | RECIPE_MAINTAINER_pn-intel-media-driver = "Lim Siew Hoon <siew.hoon.lim@intel.com>" | 13 | RECIPE_MAINTAINER:pn-intel-media-driver = "Lim Siew Hoon <siew.hoon.lim@intel.com>" |
14 | RECIPE_MAINTAINER_pn-intel-mediasdk = "Lim Siew Hoon <siew.hoon.lim@intel.com>" | 14 | RECIPE_MAINTAINER:pn-intel-mediasdk = "Lim Siew Hoon <siew.hoon.lim@intel.com>" |
15 | RECIPE_MAINTAINER_pn-intel-microcode = "Anuj Mittal <anuj.mittal@intel.com>" | 15 | RECIPE_MAINTAINER:pn-intel-microcode = "Anuj Mittal <anuj.mittal@intel.com>" |
16 | RECIPE_MAINTAINER_pn-intel-vaapi-driver = "Lim Siew Hoon <siew.hoon.lim@intel.com>" | 16 | RECIPE_MAINTAINER:pn-intel-vaapi-driver = "Lim Siew Hoon <siew.hoon.lim@intel.com>" |
17 | RECIPE_MAINTAINER_pn-ipmctl = "Anuj Mittal <anuj.mittal@intel.com>" | 17 | RECIPE_MAINTAINER:pn-ipmctl = "Anuj Mittal <anuj.mittal@intel.com>" |
18 | RECIPE_MAINTAINER_pn-isa-l = "Naveen Saini <naveen.kumar.saini@intel.com>" | 18 | RECIPE_MAINTAINER:pn-isa-l = "Naveen Saini <naveen.kumar.saini@intel.com>" |
19 | RECIPE_MAINTAINER_pn-ispc = "Naveen Saini <naveen.kumar.saini@intel.com>" | 19 | RECIPE_MAINTAINER:pn-ispc = "Naveen Saini <naveen.kumar.saini@intel.com>" |
20 | RECIPE_MAINTAINER_pn-itt = "Naveen Saini <naveen.kumar.saini@intel.com>" | 20 | RECIPE_MAINTAINER:pn-itt = "Naveen Saini <naveen.kumar.saini@intel.com>" |
21 | RECIPE_MAINTAINER_pn-ixgbe = "Naveen Saini <naveen.kumar.saini@intel.com>" | 21 | RECIPE_MAINTAINER:pn-ixgbe = "Naveen Saini <naveen.kumar.saini@intel.com>" |
22 | RECIPE_MAINTAINER_pn-ixgbevf = "Naveen Saini <naveen.kumar.saini@intel.com>" | 22 | RECIPE_MAINTAINER:pn-ixgbevf = "Naveen Saini <naveen.kumar.saini@intel.com>" |
23 | RECIPE_MAINTAINER_pn-iucode-tool = "Anuj Mittal <anuj.mittal@intel.com>" | 23 | RECIPE_MAINTAINER:pn-iucode-tool = "Anuj Mittal <anuj.mittal@intel.com>" |
24 | RECIPE_MAINTAINER_pn-jhi = "Naveen Saini <naveen.kumar.saini@intel.com>" | 24 | RECIPE_MAINTAINER:pn-jhi = "Naveen Saini <naveen.kumar.saini@intel.com>" |
25 | RECIPE_MAINTAINER_pn-level-zero = "Naveen Saini <naveen.kumar.saini@intel.com>" | 25 | RECIPE_MAINTAINER:pn-level-zero = "Naveen Saini <naveen.kumar.saini@intel.com>" |
26 | RECIPE_MAINTAINER_pn-libipt = "Naveen Saini <naveen.kumar.saini@intel.com>" | 26 | RECIPE_MAINTAINER:pn-libipt = "Naveen Saini <naveen.kumar.saini@intel.com>" |
27 | RECIPE_MAINTAINER_pn-libyami = "Anuj Mittal <anuj.mittal@intel.com>" | 27 | RECIPE_MAINTAINER:pn-libyami = "Anuj Mittal <anuj.mittal@intel.com>" |
28 | RECIPE_MAINTAINER_pn-libyami-utils = "Anuj Mittal <anuj.mittal@intel.com>" | 28 | RECIPE_MAINTAINER:pn-libyami-utils = "Anuj Mittal <anuj.mittal@intel.com>" |
29 | RECIPE_MAINTAINER_pn-libxcam = "Naveen Saini <naveen.kumar.saini@intel.com>" | 29 | RECIPE_MAINTAINER:pn-libxcam = "Naveen Saini <naveen.kumar.saini@intel.com>" |
30 | RECIPE_MAINTAINER_pn-linux-intel = "Anuj Mittal <anuj.mittal@intel.com>" | 30 | RECIPE_MAINTAINER:pn-linux-intel = "Anuj Mittal <anuj.mittal@intel.com>" |
31 | RECIPE_MAINTAINER_pn-linux-intel-rt = "Anuj Mittal <anuj.mittal@intel.com>" | 31 | RECIPE_MAINTAINER:pn-linux-intel-rt = "Anuj Mittal <anuj.mittal@intel.com>" |
32 | RECIPE_MAINTAINER_pn-linux-intel-dev = "Naveen Saini <naveen.kumar.saini@intel.com>" | 32 | RECIPE_MAINTAINER:pn-linux-intel-dev = "Naveen Saini <naveen.kumar.saini@intel.com>" |
33 | RECIPE_MAINTAINER_pn-lms = "Anuj Mittal <anuj.mittal@intel.com>" | 33 | RECIPE_MAINTAINER:pn-lms = "Anuj Mittal <anuj.mittal@intel.com>" |
34 | RECIPE_MAINTAINER_pn-metee = "Naveen Saini <naveen.kumar.saini@intel.com>" | 34 | RECIPE_MAINTAINER:pn-metee = "Naveen Saini <naveen.kumar.saini@intel.com>" |
35 | RECIPE_MAINTAINER_pn-metrics-discovery = "Naveen Saini <naveen.kumar.saini@intel.com>" | 35 | RECIPE_MAINTAINER:pn-metrics-discovery = "Naveen Saini <naveen.kumar.saini@intel.com>" |
36 | RECIPE_MAINTAINER_pn-oidn = "Naveen Saini <naveen.kumar.saini@intel.com>" | 36 | RECIPE_MAINTAINER:pn-oidn = "Naveen Saini <naveen.kumar.saini@intel.com>" |
37 | RECIPE_MAINTAINER_pn-onednn = "Naveen Saini <naveen.kumar.saini@intel.com>" | 37 | RECIPE_MAINTAINER:pn-onednn = "Naveen Saini <naveen.kumar.saini@intel.com>" |
38 | RECIPE_MAINTAINER_pn-onedpl = "Naveen Saini <naveen.kumar.saini@intel.com>" | 38 | RECIPE_MAINTAINER:pn-onedpl = "Naveen Saini <naveen.kumar.saini@intel.com>" |
39 | RECIPE_MAINTAINER_pn-onevpl = "Naveen Saini <naveen.kumar.saini@intel.com>" | 39 | RECIPE_MAINTAINER:pn-onevpl = "Naveen Saini <naveen.kumar.saini@intel.com>" |
40 | RECIPE_MAINTAINER_pn-onevpl-intel-gpu = "Yew Chang Ching <chang.ching.yew@intel.com>" | 40 | RECIPE_MAINTAINER:pn-onevpl-intel-gpu = "Yew Chang Ching <chang.ching.yew@intel.com>" |
41 | RECIPE_MAINTAINER_pn-open-model-zoo = "Anuj Mittal <anuj.mittal@intel.com>" | 41 | RECIPE_MAINTAINER:pn-open-model-zoo = "Anuj Mittal <anuj.mittal@intel.com>" |
42 | RECIPE_MAINTAINER_pn-opencl-clang = "Naveen Saini <naveen.kumar.saini@intel.com>" | 42 | RECIPE_MAINTAINER:pn-opencl-clang = "Naveen Saini <naveen.kumar.saini@intel.com>" |
43 | RECIPE_MAINTAINER_pn-openvino-inference-engine = "Anuj Mittal <anuj.mittal@intel.com>" | 43 | RECIPE_MAINTAINER:pn-openvino-inference-engine = "Anuj Mittal <anuj.mittal@intel.com>" |
44 | RECIPE_MAINTAINER_pn-openvino-model-optimizer = "Anuj Mittal <anuj.mittal@intel.com>" | 44 | RECIPE_MAINTAINER:pn-openvino-model-optimizer = "Anuj Mittal <anuj.mittal@intel.com>" |
45 | RECIPE_MAINTAINER_pn-openvkl = "Naveen Saini <naveen.kumar.saini@intel.com>" | 45 | RECIPE_MAINTAINER:pn-openvkl = "Naveen Saini <naveen.kumar.saini@intel.com>" |
46 | RECIPE_MAINTAINER_pn-ospray = "Naveen Saini <naveen.kumar.saini@intel.com>" | 46 | RECIPE_MAINTAINER:pn-ospray = "Naveen Saini <naveen.kumar.saini@intel.com>" |
47 | RECIPE_MAINTAINER_pn-ovmf-shell-image-enrollkeys = "Naveen Saini <naveen.kumar.saini@intel.com>" | 47 | RECIPE_MAINTAINER:pn-ovmf-shell-image-enrollkeys = "Naveen Saini <naveen.kumar.saini@intel.com>" |
48 | RECIPE_MAINTAINER_pn-rkcommon = "Naveen Saini <naveen.kumar.saini@intel.com>" | 48 | RECIPE_MAINTAINER:pn-rkcommon = "Naveen Saini <naveen.kumar.saini@intel.com>" |
49 | RECIPE_MAINTAINER_pn-sbsigntool-native = "Anuj Mittal <anuj.mittal@intel.com>" | 49 | RECIPE_MAINTAINER:pn-sbsigntool-native = "Anuj Mittal <anuj.mittal@intel.com>" |
50 | RECIPE_MAINTAINER_pn-secureboot-selftest-image-signed = "Anuj Mittal <anuj.mittal@intel.com>" | 50 | RECIPE_MAINTAINER:pn-secureboot-selftest-image-signed = "Anuj Mittal <anuj.mittal@intel.com>" |
51 | RECIPE_MAINTAINER_pn-secureboot-selftest-image-unsigned = "Anuj Mittal <anuj.mittal@intel.com>" | 51 | RECIPE_MAINTAINER:pn-secureboot-selftest-image-unsigned = "Anuj Mittal <anuj.mittal@intel.com>" |
52 | RECIPE_MAINTAINER_pn-thermald = "Anuj Mittal <anuj.mittal@intel.com>" | 52 | RECIPE_MAINTAINER:pn-thermald = "Anuj Mittal <anuj.mittal@intel.com>" |
53 | RECIPE_MAINTAINER_pn-xf86-video-ast = "Anuj Mittal <anuj.mittal@intel.com>" | 53 | RECIPE_MAINTAINER:pn-xf86-video-ast = "Anuj Mittal <anuj.mittal@intel.com>" |
54 | RECIPE_MAINTAINER_pn-zlib-intel = "Naveen Saini <naveen.kumar.saini@intel.com>" | 54 | RECIPE_MAINTAINER:pn-zlib-intel = "Naveen Saini <naveen.kumar.saini@intel.com>" |
diff --git a/conf/machine/include/intel-common-pkgarch.inc b/conf/machine/include/intel-common-pkgarch.inc index d0f208bd..e50d9cb4 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/meta-intel.inc b/conf/machine/include/meta-intel.inc index 19f7857d..db7c9c8b 100644 --- a/conf/machine/include/meta-intel.inc +++ b/conf/machine/include/meta-intel.inc | |||
@@ -14,8 +14,8 @@ PREFERRED_PROVIDER_nativesdk-zlib = "nativesdk-zlib" | |||
14 | 14 | ||
15 | PREFERRED_VERSION_linux-intel ?= "5.10%" | 15 | PREFERRED_VERSION_linux-intel ?= "5.10%" |
16 | PREFERRED_VERSION_linux-intel-rt ?= "5.10%" | 16 | PREFERRED_VERSION_linux-intel-rt ?= "5.10%" |
17 | PREFERRED_VERSION_linux-intel_poky-altcfg ?= "5.4%" | 17 | PREFERRED_VERSION_linux-intel:poky-altcfg ?= "5.4%" |
18 | PREFERRED_VERSION_linux-intel-rt_poky-altcfg ?= "5.4%" | 18 | PREFERRED_VERSION_linux-intel-rt:poky-altcfg ?= "5.4%" |
19 | 19 | ||
20 | # Need to point to latest version of libva needed for media components | 20 | # Need to point to latest version of libva needed for media components |
21 | PREFERRED_PROVIDER_libva = "libva-intel" | 21 | PREFERRED_PROVIDER_libva = "libva-intel" |
@@ -35,20 +35,20 @@ XSERVER_X86_ASPEED_AST = "xf86-video-ast \ | |||
35 | " | 35 | " |
36 | 36 | ||
37 | # include the user space intel microcode loading support in the generated images. | 37 | # 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)}" | 38 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', ' intel-microcode', '', d)}" |
39 | 39 | ||
40 | # recommended extra packages common to all intel machines | 40 | # recommended extra packages common to all intel machines |
41 | MACHINE_EXTRA_RRECOMMENDS_append = " kernel-modules linux-firmware" | 41 | MACHINE_EXTRA_RRECOMMENDS:append = " kernel-modules linux-firmware" |
42 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kernel-module-i915 linux-firmware-i915" | 42 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS:append = " kernel-module-i915 linux-firmware-i915" |
43 | 43 | ||
44 | # for the early boot time kernel microcode loading support, | 44 | # for the early boot time kernel microcode loading support, |
45 | # merge the microcode data in the final initrd image. | 45 | # 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)}" | 46 | INITRD_LIVE:prepend = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}" |
47 | 47 | ||
48 | DISK_SIGNATURE_UUID ??= "deadbeef-dead-beef-dead-beefdeadbeef" | 48 | DISK_SIGNATURE_UUID ??= "deadbeef-dead-beef-dead-beefdeadbeef" |
49 | 49 | ||
50 | EFI_PROVIDER ?= "systemd-boot" | 50 | EFI_PROVIDER ?= "systemd-boot" |
51 | EFI_PROVIDER_x86-x32 = "grub-efi" | 51 | EFI_PROVIDER:x86-x32 = "grub-efi" |
52 | 52 | ||
53 | # Add general MACHINEOVERRIDE for meta-intel | 53 | # Add general MACHINEOVERRIDE for meta-intel |
54 | MACHINEOVERRIDES =. "intel-x86-common:" | 54 | MACHINEOVERRIDES =. "intel-x86-common:" |
diff --git a/conf/machine/include/tune-skylake.inc b/conf/machine/include/tune-skylake.inc index 4882600b..29740121 100644 --- a/conf/machine/include/tune-skylake.inc +++ b/conf/machine/include/tune-skylake.inc | |||
@@ -17,15 +17,15 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'skylake', ' -march=skylak | |||
17 | # Extra tune selections | 17 | # Extra tune selections |
18 | 18 | ||
19 | AVAILTUNES += "skylake-64" | 19 | AVAILTUNES += "skylake-64" |
20 | TUNE_FEATURES_tune-skylake-64 = "${TUNE_FEATURES_tune-x86-64} skylake" | 20 | TUNE_FEATURES:tune-skylake-64 = "${TUNE_FEATURES:tune-x86-64} skylake" |
21 | BASE_LIB_tune-skylake-64 = "lib64" | 21 | BASE_LIB:tune-skylake-64 = "lib64" |
22 | TUNE_PKGARCH_tune-skylake-64 = "skylake-64" | 22 | TUNE_PKGARCH:tune-skylake-64 = "skylake-64" |
23 | PACKAGE_EXTRA_ARCHS_tune-skylake-64 = "${PACKAGE_EXTRA_ARCHS_tune-core2-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" | 24 | QEMU_EXTRAOPTIONS_skylake-64 = " -cpu Skylake-Client" |
25 | 25 | ||
26 | 26 | ||
27 | # Disable QEMU usermode by default (get avx2) | 27 | # Disable QEMU usermode by default (get avx2) |
28 | MACHINE_FEATURES_remove = "qemu-usermode" | 28 | MACHINE_FEATURES:remove = "qemu-usermode" |
29 | 29 | ||
30 | # If qemu-usermode is enabled, we have to disable avx2 ISA extensions, but we can keep mtune as skylake vs generic | 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)}" | 31 | SKYLAKE_TUNE .= "${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', ' -mtune=skylake ${QEMU_UNAVAILABLE_ISA}', '-mtune=generic -mavx2', d)}" |
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index 36cd9fa6..5b134dc3 100644 --- a/conf/machine/intel-core2-32.conf +++ b/conf/machine/intel-core2-32.conf | |||
@@ -29,4 +29,4 @@ APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0" | |||
29 | 29 | ||
30 | IMAGE_FSTYPES += "wic" | 30 | IMAGE_FSTYPES += "wic" |
31 | 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)}" |
32 | 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 7b94344c..719661a6 100644 --- a/conf/machine/intel-corei7-64.conf +++ b/conf/machine/intel-corei7-64.conf | |||
@@ -14,7 +14,7 @@ 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 | ||
19 | XSERVER ?= "${XSERVER_X86_BASE} \ | 19 | XSERVER ?= "${XSERVER_X86_BASE} \ |
20 | ${XSERVER_X86_EXT} \ | 20 | ${XSERVER_X86_EXT} \ |
@@ -32,4 +32,4 @@ APPEND += "rootwait console=ttyS0,115200 console=tty0" | |||
32 | 32 | ||
33 | IMAGE_FSTYPES += "wic" | 33 | 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)}" | 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_DEPENDS_append = " intel-microcode" | 35 | WKS_FILE_DEPENDS:append = " intel-microcode" |
diff --git a/conf/machine/intel-skylake-64.conf b/conf/machine/intel-skylake-64.conf index eccd59b8..f1c4f5b2 100644 --- a/conf/machine/intel-skylake-64.conf +++ b/conf/machine/intel-skylake-64.conf | |||
@@ -14,7 +14,7 @@ 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 | 18 | ||
19 | XSERVER ?= "${XSERVER_X86_BASE} \ | 19 | XSERVER ?= "${XSERVER_X86_BASE} \ |
20 | ${XSERVER_X86_EXT} \ | 20 | ${XSERVER_X86_EXT} \ |
@@ -32,4 +32,4 @@ APPEND += "rootwait console=ttyS0,115200 console=tty0" | |||
32 | 32 | ||
33 | IMAGE_FSTYPES += "wic" | 33 | 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)}" | 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_DEPENDS_append = " intel-microcode" | 35 | WKS_FILE_DEPENDS:append = " intel-microcode" |