summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2013-03-20 20:04:46 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2013-03-20 22:32:12 (GMT)
commit620aeff996b9e97b04e7144f1c7b1625e6784307 (patch)
tree19f7aa197799932b845c1fb54d0baade8ff2e1e2
parente8f0cfdd4fb4b7747b7e02c5c55be054d076a022 (diff)
downloadmeta-intel-620aeff996b9e97b04e7144f1c7b1625e6784307.tar.gz
sys940x: Update to EMGD 1.16
Use the recipe-space mechanism for adding emgd as a KERNEL_FEATURE. Update to the 1.16 version and update all the SRCREV's accordingly. Include the EMGD branch in the SRC_URI and SRCREV for the sys940x machine. Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--meta-sys940x/conf/machine/sys940x.conf2
-rw-r--r--meta-sys940x/recipes-kernel/linux/linux-yocto_3.4.bbappend15
2 files changed, 11 insertions, 6 deletions
diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf
index ce45a20..99722c8 100644
--- a/meta-sys940x/conf/machine/sys940x.conf
+++ b/meta-sys940x/conf/machine/sys940x.conf
@@ -22,7 +22,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
22PREFERRED_VERSION_xserver-xorg ?= "1.9.3" 22PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
23PREFERRED_VERSION_mesa-dri ?= "8.0.4" 23PREFERRED_VERSION_mesa-dri ?= "8.0.4"
24PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" 24PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
25PREFERRED_VERSION_emgd-driver-bin ?= "1.14" 25PREFERRED_VERSION_emgd-driver-bin ?= "1.16"
26 26
27SERIAL_CONSOLE = "115200 ttyS0" 27SERIAL_CONSOLE = "115200 ttyS0"
28APPEND += "console=ttyS0,115200 console=tty0" 28APPEND += "console=ttyS0,115200 console=tty0"
diff --git a/meta-sys940x/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-sys940x/recipes-kernel/linux/linux-yocto_3.4.bbappend
index e0229dc..0be72c6 100644
--- a/meta-sys940x/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-sys940x/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -3,13 +3,18 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
3COMPATIBLE_MACHINE_sys940x = "sys940x" 3COMPATIBLE_MACHINE_sys940x = "sys940x"
4KMACHINE_sys940x = "sys940x" 4KMACHINE_sys940x = "sys940x"
5KBRANCH_sys940x = "standard/sys940x" 5KBRANCH_sys940x = "standard/sys940x"
6SRCREV_machine_pn-linux-yocto_sys940x ?= "218bd8d2022b9852c60d32f0d770931e3cf343e2" 6KERNEL_FEATURES_sys940x_append = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb"
7SRCREV_meta_pn-linux-yocto_sys940x ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f" 7SRCREV_machine_pn-linux-yocto_sys940x ?= "840bb8c059418c4753415df56c9aff1c0d5354c8"
8SRCREV_meta_pn-linux-yocto_sys940x ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993"
9SRCREV_emgd_sys940x = "f5c3a221f0e42d48ee5af369d73594e26ef7fae6"
8 10
9COMPATIBLE_MACHINE_sys940x-noemgd = "sys940x-noemgd" 11COMPATIBLE_MACHINE_sys940x-noemgd = "sys940x-noemgd"
10KMACHINE_sys940x-noemgd = "sys940x" 12KMACHINE_sys940x-noemgd = "sys940x"
11KBRANCH_sys940x-noemgd = "standard/sys940x" 13KBRANCH_sys940x-noemgd = "standard/sys940x"
12SRCREV_machine_pn-linux-yocto_sys940x-noemgd ?= "218bd8d2022b9852c60d32f0d770931e3cf343e2" 14KERNEL_FEATURES_sys940x-noemgd_append = " cfg/vesafb"
13SRCREV_meta_pn-linux-yocto_sys940x-noemgd ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f" 15SRCREV_machine_pn-linux-yocto_sys940x-noemgd ?= "840bb8c059418c4753415df56c9aff1c0d5354c8"
16SRCREV_meta_pn-linux-yocto_sys940x-noemgd ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993"
14 17
15LINUX_VERSION = "3.4.11" 18LINUX_VERSION = "3.4.28"
19
20SRC_URI_sys940x = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.16;name=machine,meta,emgd"