summaryrefslogtreecommitdiff
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:00:48 +0100
commitb5ff3dda2a576ba7e5d68198ea6c6eb49cf80eb8 (patch)
treea7122e71297305b7387a63b56a51b05741aa750e
parent73bccbbfc0f987fc82aca5411e15f62c02e5336c (diff)
downloadopenembedded-core-b5ff3dda2a576ba7e5d68198ea6c6eb49cf80eb8.tar.gz
openembedded-core-b5ff3dda2a576ba7e5d68198ea6c6eb49cf80eb8.tar.bz2
openembedded-core-b5ff3dda2a576ba7e5d68198ea6c6eb49cf80eb8.zip
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. 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 @@
+# For runqemu
+IMAGE_CLASSES += "qemuboot"
+QB_SYSTEM_NAME_x86 = "qemu-system-i386"
+QB_CPU_x86 = "-cpu qemu32"
+QB_CPU_KVM_x86 = "-cpu kvm32"
+
+QB_SYSTEM_NAME_x86-64 = "qemu-system-x86_64"
+QB_CPU_x86-64 = "-cpu core2duo"
+QB_CPU_KVM_x86-64 = "-cpu kvm64"
+
+QB_AUDIO_DRV = "alsa"
+QB_AUDIO_OPT = "-soundhw ac97,es1370"
+QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1"
+QB_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"
require conf/machine/include/qemu.inc
DEFAULTTUNE ?= "core2-64"
require conf/machine/include/tune-core2.inc
+require conf/machine/include/qemuboot-x86.inc
KERNEL_IMAGETYPE = "bzImage"
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"
require conf/machine/include/qemu.inc
require conf/machine/include/tune-i586.inc
+require conf/machine/include/qemuboot-x86.inc
KERNEL_IMAGETYPE = "bzImage"