meta-intel: new chiefriver BSP and supporting recipes

new file mode 100644
index 0000000..fb950dc
@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal 
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+THE SOFTWARE.

107 lines not on this page · raw message

new file mode 100644
index 0000000..76180f1
@@ -0,0 +1,17 @@
+The sources for the packages comprising the images shipped with this
+BSP can be found at the following location:
+
+http://downloads.yoctoproject.org/mirror/sources/
+
+The metadata used to generate the images shipped with this BSP, in
+addition to the code contained in this BSP, can be found at the
+following location:
+
+http://www.yoctoproject.org/downloads/yocto-1.2/poky-denzil-7.0.tar.bz2
+
+The metadata used to generate the images shipped with this BSP, in
+addition to the code contained in this BSP, can also be found at the
+following locations:
+
+git://git.yoctoproject.org/poky.git
+git://git.yoctoproject.org/meta-intel

new file mode 100644
index 0000000..5dc3c02
@@ -0,0 +1,10 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH := "${BBPATH}:${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
+	${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "chiefriver"
+BBFILE_PATTERN_chiefriver := "^${LAYERDIR}/"
+BBFILE_PRIORITY_chiefriver = "6"

new file mode 100644
index 0000000..c9237f4
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: chiefriver
+
+#@DESCRIPTION: Machine configuration for Chief River systems
+# i.e. Ivy Bridge + Panther Point
+
+PREFERRED_VERSION_linux-yocto ?= "3.2%"
+
+require conf/machine/include/tune-x86_64.inc
+require conf/machine/include/ia32-base.inc
+
+XSERVER ?= "${XSERVER_IA32_BASE} \
+           ${XSERVER_IA32_EXT} \
+           ${XSERVER_IA32_I965} \
+           "

new file mode 100644
index 0000000..ffce012
@@ -0,0 +1,3 @@
+# Assume a USB mouse and keyboard are connected
+HAVE_TOUCHSCREEN=0
+HAVE_KEYBOARD=1

new file mode 100644
index 0000000..54da0ff
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+ 
+PRINC = "1"

new file mode 100644
index 0000000..4631da3
@@ -0,0 +1,2 @@
+RRECOMMENDS_task-core-tools-profile_append_chiefriver = " systemtap"
+

new file mode 100644
index 0000000..96b94b4
@@ -0,0 +1,26 @@
+Section "Device"
+    Identifier	"Intel Graphics Driver"
+    Driver	"intel"
+EndSection
+
+Section "Monitor"
+    Identifier    "Generic Monitor"
+    Option        "DPMS"
+EndSection
+
+Section "Screen"
+    Identifier    "Default Screen"
+    Device	  "Intel Graphics Driver"
+    Monitor       "Generic Monitor"
+    DefaultDepth  24
+EndSection
+
+Section "ServerLayout"
+    Identifier     "Default Layout"
+    Screen         "Default Screen"
+EndSection
+
+Section "ServerFlags"
+    Option        "DontZap"  "0"
+    Option        "AutoAddDevices"  "False"
+EndSection

new file mode 100644
index 0000000..4b8d0e6
@@ -0,0 +1,3 @@
+THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
+

new file mode 100644
index 0000000..9e4a4a0
@@ -0,0 +1,8 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_chiefriver = "chiefriver"
+KMACHINE_chiefriver  = "chiefriver"
+
+# Update the following to use a different BSP branch or meta SRCREV
+#KBRANCH_chiefriver  = "standard/preempt-rt/base"
+#SRCREV_machine_pn-linux-yocto-rt_chiefriver ?= XXXX
+#SRCREV_meta_pn-linux-yocto-rt_chiefriver ?= XXXX

new file mode 100644
index 0000000..0b707be
@@ -0,0 +1,8 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+COMPATIBLE_MACHINE_chiefriver = "chiefriver"
+KMACHINE_chiefriver  = "chiefriver"
+KBRANCH_chiefriver  = "standard/default/common-pc-64/chiefriver"
+
+SRCREV_machine_pn-linux-yocto_chiefriver ?= "dbe820c277dfa6cbc249d410e8b083286ec484b7"
+SRCREV_meta_pn-linux-yocto_chiefriver ?= "353d43d340e87996b4be4c5f6ddb4447e050b65c"

new file mode 100644
index 0000000..8ffbb51
@@ -0,0 +1,26 @@
+SUMMARY = "VA-API support to GStreamer"
+DESCRIPTION = "gstreamer-vaapi consists of a collection of VA-API \
+based plugins for GStreamer and helper libraries: `vaapidecode', \
+`vaapiconvert', and `vaapisink'."
+
+LICENSE = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
+
+DEPENDS = "gstreamer libva ffmpeg"
+
+# 0.2.9 tag
+SRCREV = "c98c14bd32855467a5a0ff21b6c703e9e3461467"
+PV = "0.2.9+git${SRCPV}"
+PR = "r0"
+
+SRC_URI = "git://gitorious.org/vaapi/gstreamer-vaapi.git"
+SRC_URI[md5sum] = "729d75f21df79114a8c81d896489e5ad"
+SRC_URI[sha256sum] = "f1770c4537f1615701dbc845eee5732fbb1036b3acafbc7488e551fab334a31d"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig gtk-doc
+
+FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
+FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
+FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"

new file mode 100644
index 0000000..e60a4b6
@@ -0,0 +1,8 @@
+require libva.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "http://cgit.freedesktop.org/vaapi/libva/snapshot/libva-${PV}.tar.bz2"
+
+SRC_URI[md5sum] = "ad8a94ba87ff0563a533c3c142816794"
+SRC_URI[sha256sum] = "7cc24ae9c947aa13904255244810d3637b03d41e2b6f4b643db3b97412cacd37"

new file mode 100644
index 0000000..f0c6b9a
@@ -0,0 +1,24 @@
+SUMMARY = "VA driver for Intel G45 & HD Graphics family"
+DESCRIPTION = "libva-driver-intel is the VA-API implementation \
+for Intel G45 chipsets and Intel HD Graphics for Intel Core \
+processor family."
+
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/vaapi"
+BUGTRACKER = "https://bugs.freedesktop.org"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f"
+
+COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
+
+INC_PR = "r0"
+
+DEPENDS = "libva"
+
+S = "${WORKDIR}/intel-driver-${PV}"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "${libdir}/dri/*.so"
+FILES_${PN}-dev += "${libdir}/dri/*.la"
+FILES_${PN}-dbg += "${libdir}/dri/.debug"

new file mode 100644
index 0000000..6fdd6a9
@@ -0,0 +1,8 @@
+require libva-intel-driver.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-${PV}.tar.bz2"
+
+SRC_URI[md5sum] = "9dbd642f18993335146480a3a2987874"
+SRC_URI[sha256sum] = "52f16f78129af00ec40afc6a1b8fb07c7b6c6c0da7f43a54e19afd2a41791098"

new file mode 100644
index 0000000..fc8b854
@@ -0,0 +1,108 @@
+DESCRIPTION = "FFmpeg is a complete solution to record, convert and stream audio and video"
+HOMEPAGE = "http://ffmpeg.mplayerhq.hu/"
+AUTHOR = "Fabrice Bellard [email protected]"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPLv2+ & LGPLv2.1+"
+
+ARM_INSTRUCTION_SET = "arm"
+
+DEPENDS = "zlib libogg libvorbis libtheora liba52"
+
+INC_PR = "r0"
+
+inherit autotools pkgconfig
+
+LEAD_SONAME = "libavcodec.so"
+
+EXTRA_OECONF = "\
+        \
+        --enable-pp \
+        --enable-shared \
+        --enable-pthreads \
+        --enable-gpl \
+        \
+        --cross-prefix=${TARGET_PREFIX} \
+        --disable-debug \
+        --disable-ffserver \
+        --disable-ffplay \
+        \
+"
+
+EXTRA_OECONF_append_powerpc += "--${@['disable-altivec','enable-altivec'][bb.data.getVar('BASE_PACKAGE_ARCH',d,1) in ['ppce600']]}"
+
+FFMPEG_LIBS = "libavcodec libavdevice libavformat \
+               libavutil libpostproc libswscale libavfilter"
+
+SYSROOT_PREPROCESS_FUNCS = " \
+  ffmpeg_stage_cleanup \
+  ffmpeg_create_compat_links"
+
+ffmpeg_create_compat_links() {
+        rm -rf ${SYSROOT_DESTDIR}${includedir}/ffmpeg
+        mkdir -m 0755 ${SYSROOT_DESTDIR}${includedir}/ffmpeg
+        cd ${SYSROOT_DESTDIR}${includedir}/ffmpeg
+
+        for lib in ${FFMPEG_LIBS}; do
+                ln -s ../$lib/*.h '.' || true
+        done
+}
+
+ffmpeg_stage_cleanup() {
+        rm -rf ${SYSROOT_DESTDIR}${libdir}/vhook \
+        ${SYSROOT_DESTDIR}${datadir}
+}
+
+PACKAGES += "${PN}-vhook-dbg ${PN}-vhook"
+
+FILES_${PN} = "${bindir}"
+FILES_${PN}-dev = "${includedir}/${PN}"
+
+FILES_${PN}-vhook = "${libdir}/vhook"
+FILES_${PN}-vhook-dbg += "${libdir}/vhook/.debug"
+
+PACKAGES += "ffmpeg-x264-presets \
+             libavcodec  libavcodec-dev  libavcodec-dbg \
+             libavdevice libavdevice-dev libavdevice-dbg \
+             libavformat libavformat-dev libavformat-dbg \
+             libavutil   libavutil-dev   libavutil-dbg \
+             libpostproc libpostproc-dev libpostproc-dbg \
+             libswscale  libswscale-dev  libswscale-dbg \
+             libavfilter libavfilter-dev libavfilter-dbg \
+             libavcore   libavcore-dev   libavcore-dbg \
+            "
+
+FILES_ffmpeg-x264-presets = "${datadir}/*.ffpreset"
+
+FILES_${PN}-dev = "${includedir}"
+FILES_libavcodec = "${libdir}/libavcodec*.so.*"
+FILES_libavcodec-dev = "${libdir}/libavcodec*.so ${libdir}/pkgconfig/libavcodec.pc ${libdir}/libavcodec*.a"
+FILES_libavcodec-dbg += "${libdir}/.debug/libavcodec*"
+
+FILES_libavdevice = "${libdir}/libavdevice*.so.*"
+FILES_libavdevice-dev = "${libdir}/libavdevice*.so ${libdir}/pkgconfig/libavdevice.pc ${libdir}/libavdevice*.a"
+FILES_libavdevice-dbg += "${libdir}/.debug/libavdevice*"
+
+FILES_libavformat = "${libdir}/libavformat*.so.*"
+FILES_libavformat-dev = "${libdir}/libavformat*.so ${libdir}/pkgconfig/libavformat.pc ${libdir}/libavformat*.a"
+FILES_libavformat-dbg += "${libdir}/.debug/libavformat*"
+
+FILES_libavutil = "${libdir}/libavutil*.so.*"
+FILES_libavutil-dev = "${libdir}/libavutil*.so ${libdir}/pkgconfig/libavutil.pc ${libdir}/libavutil*.a"
+FILES_libavutil-dbg += "${libdir}/.debug/libavutil*"
+
+FILES_libpostproc = "${libdir}/libpostproc*.so.*"
+FILES_libpostproc-dev = "${libdir}/libpostproc*.so  ${libdir}/pkgconfig/libpostproc.pc ${libdir}/libpostproc*.a ${includedir}/postproc"
+FILES_libpostproc-dbg += "${libdir}/.debug/libpostproc*"
+
+FILES_libswscale = "${libdir}/libswscale*.so.*"
+FILES_libswscale-dev = "${libdir}/libswscale*.so ${libdir}/pkgconfig/libswscale.pc ${libdir}/libswscale*.a"
+FILES_libswscale-dbg += "${libdir}/.debug/libswscale*"
+
+FILES_libavfilter = "${libdir}/libavfilter*.so.*"
+FILES_libavfilter-dev = "${libdir}/libavfilter*.so ${libdir}/pkgconfig/libavfilter.pc ${libdir}/libavfilter*.a"
+FILES_libavfilter-dbg += "${libdir}/.debug/libavfilter*"
+
+FILES_libavcore = "${libdir}/libavcore*.so.*"
+FILES_libavcore-dev = "${libdir}/libavcore*.so ${libdir}/pkgconfig/libavcore.pc ${libdir}/libavcore*.a"
+FILES_libavcore-dbg += "${libdir}/.debug/libavcore*"

41 lines not on this page · raw message

index fc8b854..aa11ee9 100644
@@ -7,7 +7,7 @@ LICENSE = "GPLv2+ & LGPLv2.1+"
 
 ARM_INSTRUCTION_SET = "arm"
 
-DEPENDS = "zlib libogg libvorbis libtheora liba52"
+DEPENDS = "zlib libogg libvorbis libtheora liba52 libva"
 
 INC_PR = "r0"
 

index 023c25f..5442b0d 100644
@@ -25,6 +25,7 @@ EXTRA_OECONF = " \
         --enable-pthreads \
         --enable-shared \
         --enable-swscale \
+        --enable-vaapi \
         --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
         --extra-ldflags="${TARGET_LDFLAGS}" \
         --sysroot="${STAGING_DIR_TARGET}" \

index 5442b0d..0d316d0 100644
@@ -26,6 +26,7 @@ EXTRA_OECONF = " \
         --enable-shared \
         --enable-swscale \
         --enable-vaapi \
+        --enable-gpl \
         --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
         --extra-ldflags="${TARGET_LDFLAGS}" \
         --sysroot="${STAGING_DIR_TARGET}" \

new file mode 100644
index 0000000..7c3fc86
@@ -0,0 +1,17 @@
+DESCRIPTION = "x86 (SSE) assembler supporting NASM and GAS-syntaxes"
+LICENSE = "BSD"
+HOMEPAGE = "http://www.tortall.net/projects/yasm/"
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=26c9f3d11f88911950f9ff62189d3d4f"
+
+SRC_URI = "http://www.tortall.net/projects/yasm/releases/yasm-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "8392e5f2235c2c2a981e1a633f2698cb"
+SRC_URI[sha256sum] = "e5d56b582f3d0c30ed5c4fc221063e4175602307ea645520889458133671c232"
+
+S = "${WORKDIR}/yasm-${PV}"
+
+inherit autotools gettext
+
+BBCLASSEXTEND = "native"

index aa11ee9..96da7c2 100644
@@ -7,7 +7,7 @@ LICENSE = "GPLv2+ & LGPLv2.1+"
 
 ARM_INSTRUCTION_SET = "arm"
 
-DEPENDS = "zlib libogg libvorbis libtheora liba52 libva"
+DEPENDS = "zlib libogg libvorbis libtheora liba52 libva yasm-native"
 
 INC_PR = "r0"
 

index 0d316d0..31442cc 100644
@@ -27,6 +27,7 @@ EXTRA_OECONF = " \
         --enable-swscale \
         --enable-vaapi \
         --enable-gpl \
+        --enable-yasm \
         --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
         --extra-ldflags="${TARGET_LDFLAGS}" \
         --sysroot="${STAGING_DIR_TARGET}" \

new file mode 100644
index 0000000..f17a3bc
@@ -0,0 +1,2 @@
+DEPENDS += "ffmpeg"
+EXTRA_OECONF += "--with-system-ffmpeg"

index 31bde4e..4f7fe9f 100644
@@ -6,10 +6,14 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 PR = "r0"
 
+VAAPI_IMPL = "${@base_contains('MACHINE_FEATURES', 'gst-va-mixvideo', 'gst-va-mixvideo-vaapi', \
+             'gst-va-intel-vaapi', d)}"
+
 PACKAGES = "\
     gst-va-intel \
     gst-va-intel-general \
     gst-va-intel-video \
+    ${VAAPI_IMPL} \
     "
 
 ALLOW_EMPTY = "1"

@@ -17,6 +21,7 @@ ALLOW_EMPTY = "1"
 RDEPENDS_gst-va-intel = "\
     gst-va-intel-general \
     gst-va-intel-video \
+    ${VAAPI_IMPL} \
     "
 
 RDEPENDS_gst-va-intel-general = "\

@@ -26,3 +31,11 @@ RDEPENDS_gst-va-intel-general = "\
 RDEPENDS_gst-va-intel-video = "\
     gst-plugins-good-isomp4 \
     "
+
+RDEPENDS_gst-va-intel-vaapi = "\
+    gstreamer-vaapi \
+    "
+
+RDEPENDS_gst-va-mixvideo-vaapi = "\
+    emgd-driver-bin \
+    "

new file mode 100644
index 0000000..3ce857a
@@ -0,0 +1,20 @@
+DESCRIPTION = "Video Acceleration Add-ons for Intel BSPs"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+PR = "r0"
+
+VA_IMPL = "${@base_contains('MACHINE_FEATURES', 'gst-va-mixvideo', \
+          'libva libva-x11 libva-tpi libva-glx libva-egl', \
+          'libva libva-intel-driver', d)}"
+
+PACKAGES = "\
+    va-intel \
+    "
+
+ALLOW_EMPTY = "1"
+
+RDEPENDS_va-intel = " \
+    ${VA_IMPL} \
+    "

index 4f7fe9f..17cb7c8 100644
@@ -1,4 +1,4 @@
-DESCRIPTION = "Video Acceleration Add-ons for Intel BSPs"
+DESCRIPTION = "GStreamer Video Acceleration Add-ons for Intel BSPs"
 LICENSE = "MIT"
 DEPENDS = "gst-meta-base"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \

index be1c8e0..99ac352 100644
@@ -57,10 +57,6 @@ XSERVER_IA32_I965 = "xf86-video-intel \
            "
 
 XSERVER_IA32_EMGD = "emgd-driver-bin \
-           libva-x11 \
-           libva-tpi \
-           libva-glx \
-           libva-egl \
            "
 
 XSERVER_IA32_VESA = "xf86-video-vesa"

index c9237f4..a78e4fd 100644
@@ -13,3 +13,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
            ${XSERVER_IA32_EXT} \
            ${XSERVER_IA32_I965} \
            "
+
+VA_FEATURES ?= "gst-va-intel va-intel"
+
+MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"

index a44f918..adb1fa7 100644
@@ -13,3 +13,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
            ${XSERVER_IA32_EXT} \
            ${XSERVER_IA32_I965} \
            "
+
+VA_FEATURES ?= "gst-va-intel va-intel"
+
+MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"

index 0d432ca..a39d037 100644
@@ -9,6 +9,8 @@ PREFERRED_VERSION_linux-yocto ?= "3.2%"
 require conf/machine/include/tune-atom.inc
 require conf/machine/include/ia32-base.inc
 
+MACHINE_FEATURES += "gst-va-mixvideo"
+
 XSERVER ?= "${XSERVER_IA32_BASE} \
            ${XSERVER_IA32_EXT} \
            ${XSERVER_IA32_EMGD} \

@@ -20,4 +22,6 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
 
 APPEND += "video=vesafb vga=0x318"
 
-MACHINE_EXTRA_RRECOMMENDS += "gst-va-intel"
+VA_FEATURES ?= "gst-va-intel va-intel"
+
+MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"

new file mode 100644
index 0000000..d3a6284
@@ -0,0 +1,14 @@
+Index: lms-7.1.20/src/tools/ATNetworkTool.cpp
+===================================================================
+--- lms-7.1.20.orig/src/tools/ATNetworkTool.cpp	2012-04-30 23:24:56.693879920 -0500
++++ lms-7.1.20/src/tools/ATNetworkTool.cpp	2012-04-30 23:25:32.363473948 -0500
+@@ -302,7 +302,9 @@
+ 			close(s);
+ 			return -1;
+ 		}
++#ifdef LMS_NET_DEBUG
+ 		printf("successfully binded local\n");
++#endif
+ 	  
+ 	}
+ 	if (bind(s, addr, addrlen) == -1) {

42 lines not on this page · raw message

index a78e4fd..4a35913 100644
@@ -16,4 +16,4 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
 
 VA_FEATURES ?= "gst-va-intel va-intel"
 
-MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"
+MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES} lms"

index 0b707be..083ddfb 100644
@@ -4,5 +4,7 @@ COMPATIBLE_MACHINE_chiefriver = "chiefriver"
 KMACHINE_chiefriver  = "chiefriver"
 KBRANCH_chiefriver  = "standard/default/common-pc-64/chiefriver"
 
+KERNEL_FEATURES_append_chiefriver = " features/amt/mei"
+
 SRCREV_machine_pn-linux-yocto_chiefriver ?= "dbe820c277dfa6cbc249d410e8b083286ec484b7"
 SRCREV_meta_pn-linux-yocto_chiefriver ?= "353d43d340e87996b4be4c5f6ddb4447e050b65c"

index f1cfe21..6a47961 100644
@@ -7,3 +7,5 @@ KBRANCH_sugarbay  = "standard/default/common-pc-64/sugarbay"
 
 SRCREV_machine_pn-linux-yocto_sugarbay ?= "0fe6d5d97c0a8d9e47716cb0da619deca07197e3"
 SRCREV_meta_pn-linux-yocto_sugarbay ?= "49f931bc294d5b6be60502bbd448cff5aa766235"
+
+KERNEL_FEATURES_append_sugarbay = " features/tmp/rc6"

index 0f6cb27..a4df96d 100644
@@ -36,6 +36,10 @@ CEDARTRAIL
 M:      Kishore Bodke <[email protected]>
 F:      meta-cedartrail/
 
+CHIEFRIVER
+M:	Tom Zanussi <[email protected]>
+F:	meta-chiefriver/
+
 COMMON
 M:	Tom Zanussi <[email protected]>
 F:	common/recipes-core/