diff options
| author | George Nita <george.nita@enea.com> | 2014-04-05 05:25:43 +0200 |
|---|---|---|
| committer | George Nita <george.nita@enea.com> | 2014-04-05 05:25:43 +0200 |
| commit | fa96c2ca5e4f882adadcb3b90e09bc0abf2f76fc (patch) | |
| tree | 1a22b4521591d980819dcd0d90b7964f8d6b1a32 /meta-fri2/conf/machine/fri2-noemgd.conf | |
| parent | 6ef83e1cb65080174a888faef3a0791158f10ee4 (diff) | |
| parent | b26946e8e7f1f3bb68625731b493156309449f5d (diff) | |
| download | meta-intel-fa96c2ca5e4f882adadcb3b90e09bc0abf2f76fc.tar.gz | |
Merge remote-tracking branch 'origin/master' into master-enea
Diffstat (limited to 'meta-fri2/conf/machine/fri2-noemgd.conf')
| -rw-r--r-- | meta-fri2/conf/machine/fri2-noemgd.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf index 43676b30..0a42d94d 100644 --- a/meta-fri2/conf/machine/fri2-noemgd.conf +++ b/meta-fri2/conf/machine/fri2-noemgd.conf | |||
| @@ -11,7 +11,7 @@ MACHINE_FEATURES += "wifi 3g pcbios efi" | |||
| 11 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" | 11 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" |
| 12 | 12 | ||
| 13 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 13 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
| 14 | PREFERRED_VERSION_linux-yocto = "3.10%" | 14 | PREFERRED_VERSION_linux-yocto = "3.14%" |
| 15 | 15 | ||
| 16 | XSERVER ?= "${XSERVER_X86_BASE} \ | 16 | XSERVER ?= "${XSERVER_X86_BASE} \ |
| 17 | ${XSERVER_X86_EXT} \ | 17 | ${XSERVER_X86_EXT} \ |