summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2021-08-06 11:23:34 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2021-08-06 15:51:53 +0800
commite67676976b73b004eb293615edeb687b05013a17 (patch)
tree0dc1bb679d7fa43ddf6071f73f286aa5f6ed86d4 /conf
parent07c200f3224dc9fac07d95c40296549203b48534 (diff)
downloadmeta-intel-e67676976b73b004eb293615edeb687b05013a17.tar.gz
Manually move some overrides to new syntax
Some of these were missed when using the script and were noticed when building intel-skylake-64 and tiny images which had started failing. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/include/meta-intel.inc2
-rw-r--r--conf/machine/include/qemuboot-intel.inc16
2 files changed, 9 insertions, 9 deletions
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc
index db7c9c8b..a8d5c161 100644
--- a/conf/machine/include/meta-intel.inc
+++ b/conf/machine/include/meta-intel.inc
@@ -5,7 +5,7 @@
5# 5#
6 6
7PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel" 7PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel"
8PREFERRED_PROVIDER_virtual/kernel_poky-tiny ?= "linux-intel" 8PREFERRED_PROVIDER_virtual/kernel:poky-tiny ?= "linux-intel"
9 9
10# Only use the Intel-tuned zlib for target builds to improve reuse 10# Only use the Intel-tuned zlib for target builds to improve reuse
11PREFERRED_PROVIDER_zlib = "zlib-intel" 11PREFERRED_PROVIDER_zlib = "zlib-intel"
diff --git a/conf/machine/include/qemuboot-intel.inc b/conf/machine/include/qemuboot-intel.inc
index f2e99d02..56f1921a 100644
--- a/conf/machine/include/qemuboot-intel.inc
+++ b/conf/machine/include/qemuboot-intel.inc
@@ -1,16 +1,16 @@
1# For runqemu 1# For runqemu
2IMAGE_CLASSES += "qemuboot" 2IMAGE_CLASSES += "qemuboot"
3QB_SYSTEM_NAME_intel-core2-32 = "qemu-system-i386" 3QB_SYSTEM_NAME_intel-core2-32 = "qemu-system-i386"
4QB_CPU_intel-core2-32 = "-cpu coreduo" 4QB_CPU:intel-core2-32 = "-cpu coreduo"
5QB_CPU_KVM_intel-core2-32 = "-cpu kvm32" 5QB_CPU_KVM:intel-core2-32 = "-cpu kvm32"
6 6
7QB_SYSTEM_NAME_intel-corei7-64 = "qemu-system-x86_64" 7QB_SYSTEM_NAME:intel-corei7-64 = "qemu-system-x86_64"
8QB_CPU_intel-corei7-64 = "-cpu Nehalem" 8QB_CPU:intel-corei7-64 = "-cpu Nehalem"
9QB_CPU_KVM_intel-corei7-64 = "-cpu kvm64" 9QB_CPU_KVM:intel-corei7-64 = "-cpu kvm64"
10 10
11QB_SYSTEM_NAME_intel-skylake-64 = "qemu-system-x86_64" 11QB_SYSTEM_NAME:intel-skylake-64 = "qemu-system-x86_64"
12QB_CPU_intel-skylake-64 = "-cpu Skylake-Client" 12QB_CPU:intel-skylake-64 = "-cpu Skylake-Client"
13QB_CPU_KVM_intel-skylake-64 = "-cpu Skylake-Client" 13QB_CPU_KVM:intel-skylake-64 = "-cpu Skylake-Client"
14 14
15QB_AUDIO_DRV = "alsa" 15QB_AUDIO_DRV = "alsa"
16QB_AUDIO_OPT = "-soundhw ac97,es1370" 16QB_AUDIO_OPT = "-soundhw ac97,es1370"