summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf2
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf8
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf
index 268ddc82d4..78a753c3df 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf
+++ b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf
@@ -58,7 +58,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
58 58
59{{ if xserver == "y" and xserver_choice == "xserver_emgd": }} 59{{ if xserver == "y" and xserver_choice == "xserver_emgd": }}
60PREFERRED_VERSION_xserver-xorg ?= "1.9.3" 60PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
61PREFERRED_VERSION_mesa-dri ?= "9.0.2" 61PREFERRED_VERSION_mesa ?= "9.0.2"
62PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" 62PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
63PREFERRED_VERSION_emgd-driver-bin ?= "1.16" 63PREFERRED_VERSION_emgd-driver-bin ?= "1.16"
64 64
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 dd7b97e162..9ab0bf410c 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
@@ -16,9 +16,9 @@ PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%"
16 16
17{{ if qemuarch == "i386" or qemuarch == "x86_64": }} 17{{ if qemuarch == "i386" or qemuarch == "x86_64": }}
18PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 18PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
19PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 19PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
20PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri" 20PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
21PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri" 21PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
22 22
23{{ input type:"choicelist" name:"qemuarch" prio:"5" msg:"Which qemu architecture would you like to use?" default:"i386" }} 23{{ input type:"choicelist" name:"qemuarch" prio:"5" msg:"Which qemu architecture would you like to use?" default:"i386" }}
24{{ input type:"choice" val:"i386" msg:"i386 (32-bit)" }} 24{{ input type:"choice" val:"i386" msg:"i386 (32-bit)" }}
@@ -47,7 +47,7 @@ SERIAL_CONSOLE = "115200 ttyS0"
47 47
48# We bypass swrast but we need it to be present for X to load correctly 48# We bypass swrast but we need it to be present for X to load correctly
49XSERVER ?= "xserver-xorg \ 49XSERVER ?= "xserver-xorg \
50 mesa-dri-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 \