diff options
| author | George Nita <george.nita@enea.com> | 2015-06-10 05:11:52 +0200 |
|---|---|---|
| committer | George Nita <george.nita@enea.com> | 2015-06-10 05:11:52 +0200 |
| commit | d9780cbbd6d63cba9be28088f1da56df5eaa11ca (patch) | |
| tree | de9655397934b97a75faf603606196e91396dc8e | |
| parent | 27840ce8c51f3e12e211195a03a6772e971c0350 (diff) | |
| parent | b92a0b5c7f6befda61466ad491ff90079bfc95c4 (diff) | |
| download | meta-intel-d9780cbbd6d63cba9be28088f1da56df5eaa11ca.tar.gz | |
Merge remote-tracking branch 'origin/master' into master-enea
| -rw-r--r-- | common/recipes-graphics/xorg-driver/xf86-video-ast_1.0.1.bb (renamed from common/recipes-graphics/xorg-driver/xf86-video-ast_0.98.0.bb) | 4 | ||||
| -rw-r--r-- | conf/machine/intel-core2-32.conf | 2 | ||||
| -rw-r--r-- | conf/machine/intel-corei7-64.conf | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/common/recipes-graphics/xorg-driver/xf86-video-ast_0.98.0.bb b/common/recipes-graphics/xorg-driver/xf86-video-ast_1.0.1.bb index 05b379e4..03ab9e36 100644 --- a/common/recipes-graphics/xorg-driver/xf86-video-ast_0.98.0.bb +++ b/common/recipes-graphics/xorg-driver/xf86-video-ast_1.0.1.bb | |||
| @@ -8,5 +8,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0b8c242f0218eea5caa949b7910a774b" | |||
| 8 | 8 | ||
| 9 | DEPENDS += "libpciaccess" | 9 | DEPENDS += "libpciaccess" |
| 10 | 10 | ||
| 11 | SRC_URI[md5sum] = "c3f15602db18e91842245a43a297cc42" | 11 | SRC_URI[md5sum] = "63ac98d6526e3e27e290e1836a229059" |
| 12 | SRC_URI[sha256sum] = "90225bc4832da9cd11e3130f0c210ed67f4f48a4ce35f1bb83bd5cc0c7d916a1" | 12 | SRC_URI[sha256sum] = "e778f1824f5eed7e3197f00f39418de1525e310fd78e0335f6178c26b9b0495b" |
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index 2b79165f..2a7aad1f 100644 --- a/conf/machine/intel-core2-32.conf +++ b/conf/machine/intel-core2-32.conf | |||
| @@ -12,7 +12,7 @@ PREFERRED_VERSION_linux-yocto ?= "3.19%" | |||
| 12 | 12 | ||
| 13 | MACHINE_FEATURES += "pcbios efi" | 13 | MACHINE_FEATURES += "pcbios efi" |
| 14 | MACHINE_FEATURES += "va-impl-intel" | 14 | MACHINE_FEATURES += "va-impl-intel" |
| 15 | MACHINE_FEATURES += "wifi 3g" | 15 | MACHINE_FEATURES += "wifi 3g nfc" |
| 16 | MACHINE_FEATURES += "intel-ucode" | 16 | MACHINE_FEATURES += "intel-ucode" |
| 17 | 17 | ||
| 18 | MACHINE_HWCODECS ?= "va-intel gstreamer-vaapi-1.0" | 18 | MACHINE_HWCODECS ?= "va-intel gstreamer-vaapi-1.0" |
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index 491ef04e..d1d43082 100644 --- a/conf/machine/intel-corei7-64.conf +++ b/conf/machine/intel-corei7-64.conf | |||
| @@ -12,7 +12,7 @@ PREFERRED_VERSION_linux-yocto ?= "3.19%" | |||
| 12 | 12 | ||
| 13 | MACHINE_FEATURES += "pcbios efi" | 13 | MACHINE_FEATURES += "pcbios efi" |
| 14 | MACHINE_FEATURES += "va-impl-intel" | 14 | MACHINE_FEATURES += "va-impl-intel" |
| 15 | MACHINE_FEATURES += "wifi 3g" | 15 | MACHINE_FEATURES += "wifi 3g nfc" |
| 16 | MACHINE_FEATURES += "intel-ucode" | 16 | MACHINE_FEATURES += "intel-ucode" |
| 17 | 17 | ||
| 18 | MACHINE_HWCODECS ?= "va-intel gstreamer-vaapi-1.0" | 18 | MACHINE_HWCODECS ?= "va-intel gstreamer-vaapi-1.0" |