diff options
| author | Ross Burton <ross.burton@intel.com> | 2014-05-30 16:05:59 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-01 14:29:32 +0100 |
| commit | 32111c42b7bc92d5c26f0d353da18ffd966a0d7e (patch) | |
| tree | bffb7599f18e6a5d4dc006ae29a97c4401dc2425 /meta-yocto-bsp/conf/machine/include | |
| parent | 60c40e5db57da094ab5ecfadf8e07dc6251bec66 (diff) | |
| download | poky-32111c42b7bc92d5c26f0d353da18ffd966a0d7e.tar.gz | |
genericx86: switch to Linux 3.14 from 3.10
Boot-tested on a NUC.
(From meta-yocto rev: ef7e8d3f250c66ff6ab422c9527fd8b3a5386234)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto-bsp/conf/machine/include')
| -rw-r--r-- | meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc index 66bfd194da..c61be97f22 100644 --- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc +++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc | |||
| @@ -2,7 +2,7 @@ include conf/machine/include/x86-base.inc | |||
| 2 | MACHINE_FEATURES += "wifi efi pcbios" | 2 | MACHINE_FEATURES += "wifi efi pcbios" |
| 3 | 3 | ||
| 4 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 4 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
| 5 | PREFERRED_VERSION_linux-yocto ?= "3.10%" | 5 | PREFERRED_VERSION_linux-yocto ?= "3.14%" |
| 6 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | 6 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
| 7 | XSERVER ?= "${XSERVER_X86_BASE} \ | 7 | XSERVER ?= "${XSERVER_X86_BASE} \ |
| 8 | ${XSERVER_X86_EXT} \ | 8 | ${XSERVER_X86_EXT} \ |