diff options
| author | Mariano Lopez <mariano.lopez@linux.intel.com> | 2016-03-03 15:17:21 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-09 16:58:14 +0000 |
| commit | a27ca6da59e6939a5bbab641236f7f792c03694f (patch) | |
| tree | ff925b162f6e620e66f1dd049ff673cb68f66a1a /scripts/lib/bsp/substrate/target/arch/i386/conf/machine/machine.conf | |
| parent | 2d0933ce31619f9dd0c28c5ed3486059442c250b (diff) | |
| download | poky-a27ca6da59e6939a5bbab641236f7f792c03694f.tar.gz | |
yocto-bsp: Update templates to 4.4 kernel
Add kernel 4.4 support. kernel 4.1 was left in the
tree for user to choose between 4.1 and 4.4.
[YOCTO #9047]
(From meta-yocto rev: c04093ec9b3cd151cf857bca9ad35bc9a0d4a4b1)
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@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 1739ab3cfe..d5abe4f613 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_4.1" or kernel_choice == "linux-yocto_3.19" or kernel_choice == "linux-yocto_3.14"): }} | 36 | {{ if xserver == "y" and (kernel_choice == "linux-yocto_4.4" or kernel_choice == "linux-yocto_4.1"): }} |
| 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_4.1" and kernel_choice != "linux-yocto_3.19" and kernel_choice != "linux-yocto_3.14" and kernel_choice != "custom": xserver_choice = "xserver_i915" }} | 52 | {{ if xserver == "y" and kernel_choice != "linux-yocto_4.4" and kernel_choice != "linux-yocto_4.1" 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} \ |