From eb629657aaf0cb1c52aaae7612ee5b62b29f6b7c Mon Sep 17 00:00:00 2001 From: Leonardo Sandoval Date: Tue, 4 Oct 2016 16:53:36 -0500 Subject: 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 Signed-off-by: Richard Purdie --- .../bsp/substrate/target/arch/i386/conf/machine/machine.conf | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'scripts') 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 d5abe4f613..a95562797a 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 @@ -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" }} -- cgit 1.2.3-korg