diff options
Diffstat (limited to 'conf/machine/include/meta-intel.inc')
-rw-r--r-- | conf/machine/include/meta-intel.inc | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc index 19f7857d..230d0253 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,28 @@ 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', \ | 23 | LLVM_MAJOR_VERSION = "${@d.getVar('LLVMVERSION').split('.')[0]}" |
30 | bb.utils.contains('LLVMVERSION', '11.1.0', '11.0.0', '12.0.0', d), d)}" | 24 | PREFERRED_VERSION_opencl-clang ?= "${@bb.utils.contains('LLVM_MAJOR_VERSION', '14', '14.0.0', '15.0.0', d)}" |
31 | PREFERRED_VERSION_opencl-clang-native ?= "${@bb.utils.contains('LLVMVERSION', '10.0.1', '10.0.0', \ | 25 | PREFERRED_VERSION_opencl-clang-native ?= "${@bb.utils.contains('LLVM_MAJOR_VERSION', '14', '14.0.0', '15.0.0', d)}" |
32 | bb.utils.contains('LLVMVERSION', '11.1.0', '11.0.0', '12.0.0', d), d)}" | ||
33 | 26 | ||
34 | XSERVER_X86_ASPEED_AST = "xf86-video-ast \ | 27 | XSERVER_X86_ASPEED_AST = "xf86-video-ast \ |
35 | " | 28 | " |
36 | 29 | ||
37 | # include the user space intel microcode loading support in the generated images. | 30 | # 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)}" | 31 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', ' intel-microcode', '', d)}" |
39 | 32 | ||
40 | # recommended extra packages common to all intel machines | 33 | # recommended extra packages common to all intel machines |
41 | MACHINE_EXTRA_RRECOMMENDS_append = " kernel-modules linux-firmware" | 34 | MACHINE_EXTRA_RRECOMMENDS:append = " kernel-modules linux-firmware" |
42 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kernel-module-i915 linux-firmware-i915" | 35 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS:append = " kernel-module-i915 linux-firmware-i915 kernel-module-igc kernel-module-r8152" |
43 | 36 | ||
44 | # for the early boot time kernel microcode loading support, | 37 | # for the early boot time kernel microcode loading support, |
45 | # merge the microcode data in the final initrd image. | 38 | # 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)}" | 39 | INITRD_LIVE:prepend = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}" |
47 | 40 | ||
48 | DISK_SIGNATURE_UUID ??= "deadbeef-dead-beef-dead-beefdeadbeef" | 41 | DISK_SIGNATURE_UUID ??= "deadbeef-dead-beef-dead-beefdeadbeef" |
49 | 42 | ||
50 | EFI_PROVIDER ?= "systemd-boot" | 43 | EFI_PROVIDER ?= "systemd-boot" |
51 | EFI_PROVIDER_x86-x32 = "grub-efi" | 44 | EFI_PROVIDER:x86-x32 = "grub-efi" |
52 | 45 | ||
53 | # Add general MACHINEOVERRIDE for meta-intel | 46 | # Add general MACHINEOVERRIDE for meta-intel |
54 | MACHINEOVERRIDES =. "intel-x86-common:" | 47 | MACHINEOVERRIDES =. "intel-x86-common:" |