diff options
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf')
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf | 7 |
1 files changed, 4 insertions, 3 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 100c68cc46..2c109af9b3 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 | |||
@@ -23,13 +23,14 @@ require conf/machine/include/ia32-base.inc | |||
23 | 23 | ||
24 | {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} | 24 | {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} |
25 | 25 | ||
26 | {{ if xserver == "y": }} | 26 | {{ if xserver == "y" and kernel_choice == "linux-yocto_3.2": }} |
27 | {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_i915" }} | 27 | {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_i915" }} |
28 | |||
29 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} | 28 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} |
30 | {{ input type:"choice" val:"xserver_emgd" msg:"EMGD xserver support (proprietary)" }} | 29 | {{ input type:"choice" val:"xserver_emgd" msg:"EMGD xserver support (proprietary)" }} |
31 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} | 30 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} |
32 | 31 | ||
32 | {{ if xserver == "y" and kernel_choice != "linux-yocto_3.2": xserver_choice = "xserver_i915" }} | ||
33 | |||
33 | {{ if xserver == "y": }} | 34 | {{ if xserver == "y": }} |
34 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 35 | XSERVER ?= "${XSERVER_IA32_BASE} \ |
35 | ${XSERVER_IA32_EXT} \ | 36 | ${XSERVER_IA32_EXT} \ |
@@ -45,7 +46,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ | |||
45 | {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} | 46 | {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} |
46 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" | 47 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" |
47 | PREFERRED_VERSION_mesa-dri ?= "7.11" | 48 | PREFERRED_VERSION_mesa-dri ?= "7.11" |
48 | PREFERRED_VERSION_emgd-driver-bin ?= "1.8" | 49 | PREFERRED_VERSION_emgd-driver-bin ?= "1.10" |
49 | 50 | ||
50 | {{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }} | 51 | {{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }} |
51 | APPEND += "video=vesafb vga=0x318" | 52 | APPEND += "video=vesafb vga=0x318" |