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 | 4 |
1 files changed, 2 insertions, 2 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 86d6a53331..6c0ecbae48 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 | |||
@@ -30,7 +30,7 @@ require conf/machine/include/meta-intel.inc | |||
30 | 30 | ||
31 | {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} | 31 | {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} |
32 | 32 | ||
33 | {{ if xserver == "y" and kernel_choice == "linux-yocto_3.4": }} | 33 | {{ if xserver == "y" and (kernel_choice == "linux-yocto_3.4" or kernel_choice == "linux-yocto_3.8"): }} |
34 | {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_i915" }} | 34 | {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_i915" }} |
35 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} | 35 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} |
36 | {{ input type:"choice" val:"xserver_emgd" msg:"EMGD xserver support (proprietary)" }} | 36 | {{ input type:"choice" val:"xserver_emgd" msg:"EMGD xserver support (proprietary)" }} |
@@ -41,7 +41,7 @@ require conf/machine/include/meta-intel.inc | |||
41 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} | 41 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} |
42 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} | 42 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} |
43 | 43 | ||
44 | {{ if xserver == "y" and kernel_choice != "linux-yocto_3.4" and kernel_choice != "custom": xserver_choice = "xserver_i915" }} | 44 | {{ if xserver == "y" and kernel_choice != "linux-yocto_3.4" and kernel_choice != "linux-yocto_3.8" and kernel_choice != "custom": xserver_choice = "xserver_i915" }} |
45 | 45 | ||
46 | {{ if xserver == "y": }} | 46 | {{ if xserver == "y": }} |
47 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 47 | XSERVER ?= "${XSERVER_IA32_BASE} \ |