From 32a3d0dfdef7551fcf83eeaaca89f6415b127585 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Thu, 28 Feb 2013 00:27:16 -0600 Subject: yocto-bsp: add 3.8/remove 3.2 kernel from templates For Yocto 1.4, 3.8 is the preferred kernel and 3.2 is obsolete. (From meta-yocto rev: 5b07921319901a3709492c43397c57bbd2201585) Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- .../lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf') 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 {{ 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_3.4": }} +{{ if xserver == "y" and (kernel_choice == "linux-yocto_3.4" or kernel_choice == "linux-yocto_3.8"): }} {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_i915" }} {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} {{ input type:"choice" val:"xserver_emgd" msg:"EMGD xserver support (proprietary)" }} @@ -41,7 +41,7 @@ require conf/machine/include/meta-intel.inc {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} -{{ if xserver == "y" and kernel_choice != "linux-yocto_3.4" and kernel_choice != "custom": xserver_choice = "xserver_i915" }} +{{ 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" }} {{ if xserver == "y": }} XSERVER ?= "${XSERVER_IA32_BASE} \ -- cgit v1.2.3-54-g00ecf