machine.conf: Remove duplicate xserver choices
All kernel choices today (linux-yocto_4.* and custom) have the same xserver options, so remove the duplicate lines. (From meta-yocto rev: c456b5cf172e5ee1fca078383cad189325ea05f5) Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
fe18ded6c3
commit
eb629657aa
|
@ -33,15 +33,7 @@ MACHINE_FEATURES += "wifi efi pcbios"
|
|||
|
||||
{{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }}
|
||||
|
||||
{{ if xserver == "y" and (kernel_choice == "linux-yocto_4.4" or kernel_choice == "linux-yocto_4.1"): }}
|
||||
{{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_vesa" }}
|
||||
{{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }}
|
||||
{{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }}
|
||||
{{ input type:"choice" val:"xserver_i965" msg:"i965 xserver support" }}
|
||||
{{ input type:"choice" val:"xserver_fbdev" msg:"fbdev xserver support" }}
|
||||
{{ input type:"choice" val:"xserver_modesetting" msg:"modesetting xserver support" }}
|
||||
|
||||
{{ if xserver == "y" and kernel_choice == "custom": }}
|
||||
{{ if xserver == "y": }}
|
||||
{{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_vesa" }}
|
||||
{{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }}
|
||||
{{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }}
|
||||
|
|
Loading…
Reference in New Issue