diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2013-02-28 00:27:16 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-17 23:10:26 +0000 |
commit | 32a3d0dfdef7551fcf83eeaaca89f6415b127585 (patch) | |
tree | bbeaeef3505b0da6aa70e9a49801abe27597caaa /scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf | |
parent | b76d07945e08d9aeb3aa14c6935e5263db1909dc (diff) | |
download | poky-32a3d0dfdef7551fcf83eeaaca89f6415b127585.tar.gz |
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 <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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} \ |