diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2021-07-31 17:47:03 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2021-07-31 17:47:03 +0800 |
commit | 0584f638797a816b29b909d4611d5a099df7bbc1 (patch) | |
tree | 1ec4bdacf824c304290b5086fd54bba9b84158e2 /conf/machine/include | |
parent | 7a5e47b6a594eb29dfe84e47f043a49974bc0402 (diff) | |
download | meta-intel-0584f638797a816b29b909d4611d5a099df7bbc1.tar.gz |
Convert to new override syntax
Use the convert-overrides.py to convert to new syntax and manually
fix some additional changes.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'conf/machine/include')
-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 |
3 files changed, 25 insertions, 25 deletions
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)}" |