diff options
| author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2015-02-27 09:33:44 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-24 10:06:03 +0000 |
| commit | 369932178fe9e7aa4a6d0e2ef1e2e539be701d02 (patch) | |
| tree | 416781934dfac975b3ea044813ba995964bd66a4 /scripts/lib/bsp/substrate/target/arch/i386/conf/machine/machine.conf | |
| parent | 4bd886fb0081954879aaa2f574f3c7f6ced745d5 (diff) | |
| download | poky-369932178fe9e7aa4a6d0e2ef1e2e539be701d02.tar.gz | |
yocto-bsp: Update templates to 3.19 kernel
Add 3.19 kernel support and remove 3.10 and 3.17 support.
'Fixes' [YOCTO #7391].
(From meta-yocto rev: fe9b3c567230e815f528431f1098626669a9568f)
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 e13dabc1e5..7189341909 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,7 +33,7 @@ MACHINE_FEATURES += "wifi efi pcbios" | |||
| 33 | 33 | ||
| 34 | {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} | 34 | {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} |
| 35 | 35 | ||
| 36 | {{ if xserver == "y" and (kernel_choice == "linux-yocto_3.17" or kernel_choice == "linux-yocto_3.14" or kernel_choice == "linux-yocto_3.10"): }} | 36 | {{ if xserver == "y" and (kernel_choice == "linux-yocto_3.19" or kernel_choice == "linux-yocto_3.14"): }} |
| 37 | {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_vesa" }} | 37 | {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_vesa" }} |
| 38 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} | 38 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} |
| 39 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} | 39 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} |
| @@ -49,7 +49,7 @@ MACHINE_FEATURES += "wifi efi pcbios" | |||
| 49 | {{ input type:"choice" val:"xserver_fbdev" msg:"fbdev xserver support" }} | 49 | {{ input type:"choice" val:"xserver_fbdev" msg:"fbdev xserver support" }} |
| 50 | {{ input type:"choice" val:"xserver_modesetting" msg:"modesetting xserver support" }} | 50 | {{ input type:"choice" val:"xserver_modesetting" msg:"modesetting xserver support" }} |
| 51 | 51 | ||
| 52 | {{ if xserver == "y" and kernel_choice != "linux-yocto_3.17" and kernel_choice != "linux-yocto_3.14" and kernel_choice != "linux-yocto_3.10" and kernel_choice != "custom": xserver_choice = "xserver_i915" }} | 52 | {{ if xserver == "y" and kernel_choice != "linux-yocto_3.19" and kernel_choice != "linux-yocto_3.14" and kernel_choice != "custom": xserver_choice = "xserver_i915" }} |
| 53 | 53 | ||
| 54 | {{ if xserver == "y": }} | 54 | {{ if xserver == "y": }} |
| 55 | XSERVER ?= "${XSERVER_X86_BASE} \ | 55 | XSERVER ?= "${XSERVER_X86_BASE} \ |