summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2013-04-03 20:03:34 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-05 21:54:30 (GMT)
commite86201100b29c37177b5a309f652fc0ce631bdf4 (patch)
tree3b827224f0559c54634bb9323454e958f7ae5003 /scripts/lib
parent3b56472ad96150720a87cba2cb43d49f37dc4d33 (diff)
downloadpoky-e86201100b29c37177b5a309f652fc0ce631bdf4.tar.gz
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>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf8
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 9ab0bf4..d66d28f 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"
27{{ input type:"choice" val:"powerpc" msg:"PowerPC (32-bit)" }} 27{{ input type:"choice" val:"powerpc" msg:"PowerPC (32-bit)" }}
28{{ input type:"choice" val:"mips" msg:"MIPS (32-bit)" }} 28{{ input type:"choice" val:"mips" msg:"MIPS (32-bit)" }}
29{{ if qemuarch == "i386": }} 29{{ if qemuarch == "i386": }}
30require conf/machine/include/qemu.inc
30require conf/machine/include/tune-i586.inc 31require conf/machine/include/tune-i586.inc
31{{ if qemuarch == "x86_64": }} 32{{ if qemuarch == "x86_64": }}
33require conf/machine/include/qemu.inc
32require conf/machine/include/tune-x86_64.inc 34require conf/machine/include/tune-x86_64.inc
33{{ if qemuarch == "arm": }} 35{{ if qemuarch == "arm": }}
34require conf/machine/include/qemu.inc 36require conf/machine/include/qemu.inc
@@ -44,17 +46,13 @@ require conf/machine/include/tune-mips32.inc
44MACHINE_FEATURES += "x86" 46MACHINE_FEATURES += "x86"
45KERNEL_IMAGETYPE = "bzImage" 47KERNEL_IMAGETYPE = "bzImage"
46SERIAL_CONSOLE = "115200 ttyS0" 48SERIAL_CONSOLE = "115200 ttyS0"
47 49XSERVER = "xserver-xorg \
48# We bypass swrast but we need it to be present for X to load correctly
49XSERVER ?= "xserver-xorg \
50 mesa-driver-swrast \ 50 mesa-driver-swrast \
51 xf86-input-vmmouse \ 51 xf86-input-vmmouse \
52 xf86-input-keyboard \ 52 xf86-input-keyboard \
53 xf86-input-evdev \ 53 xf86-input-evdev \
54 xf86-video-vmware" 54 xf86-video-vmware"
55 55
56require conf/machine/include/qemu.inc
57
58{{ if qemuarch == "arm": }} 56{{ if qemuarch == "arm": }}
59KERNEL_IMAGETYPE = "zImage" 57KERNEL_IMAGETYPE = "zImage"
60SERIAL_CONSOLE = "115200 ttyAMA0" 58SERIAL_CONSOLE = "115200 ttyAMA0"