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-nuc/conf/machine/nuc.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-nuc/conf/machine/nuc.conf')
| -rw-r--r-- | meta-nuc/conf/machine/nuc.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta-nuc/conf/machine/nuc.conf b/meta-nuc/conf/machine/nuc.conf index 7913dc21..fdbbbda8 100644 --- a/meta-nuc/conf/machine/nuc.conf +++ b/meta-nuc/conf/machine/nuc.conf | |||
| @@ -6,10 +6,11 @@ | |||
| 6 | #@DESCRIPTION: Machine configuration for Intel NUC model DC3217IYE | 6 | #@DESCRIPTION: Machine configuration for Intel NUC model DC3217IYE |
| 7 | # i.e. Ivy Bridge + Panther Point | 7 | # i.e. Ivy Bridge + Panther Point |
| 8 | 8 | ||
| 9 | PREFERRED_VERSION_linux-yocto ?= "3.10%" | 9 | PREFERRED_VERSION_linux-yocto ?= "3.14%" |
| 10 | MACHINE_FEATURES += "va-impl-intel wifi" | 10 | MACHINE_FEATURES += "va-impl-intel wifi" |
| 11 | 11 | ||
| 12 | require conf/machine/include/intel-corei7-64-common.inc | 12 | require conf/machine/include/intel-corei7-64-common.inc |
| 13 | require conf/machine/include/intel-common-pkgarch.inc | ||
| 13 | 14 | ||
| 14 | MACHINE_HWCODECS ?= "va-intel gst-va-intel" | 15 | MACHINE_HWCODECS ?= "va-intel gst-va-intel" |
| 15 | 16 | ||