aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2013-07-24 12:43:41 -0700
committerDarren Hart <dvhart@linux.intel.com>2013-08-06 10:46:52 -0700
commit249a477c9a0e350304153d2be96a98bc8be44601 (patch)
tree8cf26ff32306a689d3bc33d75d17545158dd51f9
parenta1cfe0e7fc59eb1e430db07840d6b6d54b8733e2 (diff)
downloadmeta-minnow-249a477c9a0e350304153d2be96a98bc8be44601.tar.gz
meta-minnow-249a477c9a0e350304153d2be96a98bc8be44601.tar.bz2
meta-minnow-249a477c9a0e350304153d2be96a98bc8be44601.zip
emgd: Update to EMGD 1.18
Set the preferred version and update the KERNEL_FEATURES and SRC_URI to merge the emgd-1.18 branch. Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-rw-r--r--conf/machine/minnow.conf2
-rw-r--r--recipes-kernel/linux/linux-yocto_3.8.bbappend8
2 files changed, 5 insertions, 5 deletions
diff --git a/conf/machine/minnow.conf b/conf/machine/minnow.conf
index b18fdba..87ea2b9 100644
--- a/conf/machine/minnow.conf
+++ b/conf/machine/minnow.conf
@@ -30,7 +30,7 @@ PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
PREFERRED_VERSION_mesa ?= "9.1.5"
PREFERRED_VERSION_xf86-input-synaptics ?= "1.6.3"
PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
-PREFERRED_VERSION_emgd-driver-bin ?= "1.16"
+PREFERRED_VERSION_emgd-driver-bin ?= "1.18"
PREFERRED_VERSION_libva ?= "1.0.16"
APPEND += "console=ttyPCH0,115200 console=tty0 vmalloc=256MB \
diff --git a/recipes-kernel/linux/linux-yocto_3.8.bbappend b/recipes-kernel/linux/linux-yocto_3.8.bbappend
index a3a9502..b1ef7b3 100644
--- a/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ b/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -6,16 +6,16 @@ KBRANCH_minnow = "standard/minnow"
COMPATIBLE_MACHINE_minnow = "minnow"
KMACHINE_minnow = "minnow"
-KERNEL_FEATURES_minnow_append = " features/drm-emgd/drm-emgd-1.16 \
+KERNEL_FEATURES_minnow_append = " features/drm-emgd/drm-emgd-1.18 \
features/netfilter/netfilter.scc \
features/usb-net/usb-net.scc"
-SRC_URI_minnow = "git://git.yoctoproject.org/linux-yocto-3.8;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.16;name=machine,meta,emgd \
+SRC_URI_minnow = "git://git.yoctoproject.org/linux-yocto-3.8;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd \
file://media.cfg"
SRCREV_machine_pn-linux-yocto_minnow ?= "4afed227ab8d84c7eaf222cad85e8232e4ea9cb0"
-SRCREV_meta_pn-linux-yocto_minnow ?= "c0851dfb8535635e1e31d4a5146d3f021e30506c"
-SRCREV_emgd_pn-linux-yocto_minnow ?= "caea08c988e0f41103bbe18eafca20348f95da02"
+SRCREV_meta_pn-linux-yocto_minnow ?= "375cb6ebfdb23b0e81cc557bdd4dd39fab29bc50"
+SRCREV_emgd_pn-linux-yocto_minnow ?= "a18cbb7a2886206815dbf6c85caed3cb020801e0"
# Autoload modules for on-board hardware
module_autoload_snd_hda_intel = "snd_hda_intel"