summaryrefslogtreecommitdiffstats
path: root/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf
diff options
context:
space:
mode:
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}}.conf4
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 2fff9b7e92..932fd79bb9 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
@@ -32,7 +32,7 @@ MACHINE_FEATURES += "wifi efi pcbios"
32 32
33{{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} 33{{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }}
34 34
35{{ if xserver == "y" and (kernel_choice == "linux-yocto_3.4" or kernel_choice == "linux-yocto_3.10"): }} 35{{ if xserver == "y" and (kernel_choice == "linux-yocto_3.14" or kernel_choice == "linux-yocto_3.10"): }}
36{{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_i915" }} 36{{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_i915" }}
37{{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} 37{{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }}
38{{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} 38{{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }}
@@ -44,7 +44,7 @@ MACHINE_FEATURES += "wifi efi pcbios"
44{{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} 44{{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }}
45{{ input type:"choice" val:"xserver_i965" msg:"i965 xserver support" }} 45{{ input type:"choice" val:"xserver_i965" msg:"i965 xserver support" }}
46 46
47{{ if xserver == "y" and kernel_choice != "linux-yocto_3.4" and kernel_choice != "linux-yocto_3.10" and kernel_choice != "custom": xserver_choice = "xserver_i915" }} 47{{ if xserver == "y" and kernel_choice != "linux-yocto_3.14" and kernel_choice != "linux-yocto_3.10" and kernel_choice != "custom": xserver_choice = "xserver_i915" }}
48 48
49{{ if xserver == "y": }} 49{{ if xserver == "y": }}
50XSERVER ?= "${XSERVER_X86_BASE} \ 50XSERVER ?= "${XSERVER_X86_BASE} \