{{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }}
-{{ if xserver == "y": }}
+{{ if xserver == "y" and kernel_choice == "linux-yocto_3.2": }}
{{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_i915" }}
-
{{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }}
{{ input type:"choice" val:"xserver_emgd" msg:"EMGD xserver support (proprietary)" }}
{{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }}
+{{ if xserver == "y" and kernel_choice != "linux-yocto_3.2": xserver_choice = "xserver_i915" }}
+
{{ if xserver == "y": }}
XSERVER ?= "${XSERVER_IA32_BASE} \
${XSERVER_IA32_EXT} \
{{ if xserver == "y" and xserver_choice == "xserver_emgd": }}
PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
PREFERRED_VERSION_mesa-dri ?= "7.11"
-PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
+PREFERRED_VERSION_emgd-driver-bin ?= "1.10"
{{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }}
APPEND += "video=vesafb vga=0x318"
include features/ericsson-3g/f5521gw.scc
{{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }}
-include features/framebuffer/vesafb.scc
+include cfg/vesafb.scc
include cfg/usb-mass-storage.scc
include cfg/boot-live.scc