yocto-bsp: qemu machine template updates

A few small changes to the machine.conf from the previous version that
should be incorporated.

(From meta-yocto rev: 05a86a2e8d69b32243ab1915b279411d3d82235f)

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 3 insertions, 5 deletions

diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf
index 9ab0bf410c..d66d28f7ad 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf
@@ -27,8 +27,10 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
 {{ input type:"choice" val:"powerpc" msg:"PowerPC (32-bit)" }}
 {{ input type:"choice" val:"mips" msg:"MIPS    (32-bit)" }}
 {{ if qemuarch == "i386": }}
+require conf/machine/include/qemu.inc
 require conf/machine/include/tune-i586.inc
 {{ if qemuarch == "x86_64": }}
+require conf/machine/include/qemu.inc
 require conf/machine/include/tune-x86_64.inc
 {{ if qemuarch == "arm": }}
 require conf/machine/include/qemu.inc
@@ -44,17 +46,13 @@ require conf/machine/include/tune-mips32.inc
 MACHINE_FEATURES += "x86"
 KERNEL_IMAGETYPE = "bzImage"
 SERIAL_CONSOLE = "115200 ttyS0"
-
-# We bypass swrast but we need it to be present for X to load correctly
-XSERVER ?= "xserver-xorg \
+XSERVER = "xserver-xorg \
            mesa-driver-swrast \
            xf86-input-vmmouse \
            xf86-input-keyboard \
            xf86-input-evdev \
            xf86-video-vmware"
 
-require conf/machine/include/qemu.inc
-
 {{ if qemuarch == "arm": }}
 KERNEL_IMAGETYPE = "zImage"
 SERIAL_CONSOLE = "115200 ttyAMA0"