summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-08-25 07:41:01 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-09 12:07:31 +0100
commit64da0d77991c3bdd98a64060a338a4a2aac9551e (patch)
tree01de9c4e44b1ffd65aecf7f22f11a1ac7d3d3e8b
parent9b0a94cbed59c591bd1b3758967705ccfac171a8 (diff)
downloadpoky-64da0d77991c3bdd98a64060a338a4a2aac9551e.tar.gz
qemux86.conf/qemux86-64.conf: set vars for runqemu
Add qemuboot-x86.inc to reduce duplicated code, the x86/x86_64 bsps which can be boot by runqemu can require qemuboot-x86.inc. (From OE-Core rev: b5ff3dda2a576ba7e5d68198ea6c6eb49cf80eb8) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/machine/include/qemuboot-x86.inc14
-rw-r--r--meta/conf/machine/qemux86-64.conf1
-rw-r--r--meta/conf/machine/qemux86.conf1
3 files changed, 16 insertions, 0 deletions
diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc
new file mode 100644
index 0000000000..2ff3ca94bf
--- /dev/null
+++ b/meta/conf/machine/include/qemuboot-x86.inc
@@ -0,0 +1,14 @@
1# For runqemu
2IMAGE_CLASSES += "qemuboot"
3QB_SYSTEM_NAME_x86 = "qemu-system-i386"
4QB_CPU_x86 = "-cpu qemu32"
5QB_CPU_KVM_x86 = "-cpu kvm32"
6
7QB_SYSTEM_NAME_x86-64 = "qemu-system-x86_64"
8QB_CPU_x86-64 = "-cpu core2duo"
9QB_CPU_KVM_x86-64 = "-cpu kvm64"
10
11QB_AUDIO_DRV = "alsa"
12QB_AUDIO_OPT = "-soundhw ac97,es1370"
13QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1"
14QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet"
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index ac2c039ebf..b191ddd3cb 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -10,6 +10,7 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
10require conf/machine/include/qemu.inc 10require conf/machine/include/qemu.inc
11DEFAULTTUNE ?= "core2-64" 11DEFAULTTUNE ?= "core2-64"
12require conf/machine/include/tune-core2.inc 12require conf/machine/include/tune-core2.inc
13require conf/machine/include/qemuboot-x86.inc
13 14
14KERNEL_IMAGETYPE = "bzImage" 15KERNEL_IMAGETYPE = "bzImage"
15 16
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 5d22e52d27..8555fd6bfe 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -9,6 +9,7 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
9 9
10require conf/machine/include/qemu.inc 10require conf/machine/include/qemu.inc
11require conf/machine/include/tune-i586.inc 11require conf/machine/include/tune-i586.inc
12require conf/machine/include/qemuboot-x86.inc
12 13
13KERNEL_IMAGETYPE = "bzImage" 14KERNEL_IMAGETYPE = "bzImage"
14 15