diff options
| author |   Darren Hart <dvhart@linux.intel.com> | 2013-03-20 13:09:39 -0700 |
|---|---|---|
| committer |   Tom Zanussi <tom.zanussi@intel.com> | 2013-03-20 19:07:44 -0500 |
| commit | 4d93485d35c1768c102fb8a725dbb48ac824ad4d (patch) | |
| tree | e2a49f2c2c8d8c1d5c82ef98bf44f9d797517b2c | |
| parent | 620aeff996b9e97b04e7144f1c7b1625e6784307 (diff) | |
| download | meta-intel-4d93485d35c1768c102fb8a725dbb48ac824ad4d.tar.gz meta-intel-4d93485d35c1768c102fb8a725dbb48ac824ad4d.tar.bz2 meta-intel-4d93485d35c1768c102fb8a725dbb48ac824ad4d.zip | |
crownbay: 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 crownbay
machine.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
| -rw-r--r-- | meta-crownbay/conf/machine/crownbay.conf | 1 | ||||
| -rw-r--r-- | meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend | 18 |
2 files changed, 12 insertions, 7 deletions
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf index 1fd9fe8a..4418b641 100644 --- a/meta-crownbay/conf/machine/crownbay.conf +++ b/meta-crownbay/conf/machine/crownbay.conf @@ -22,6 +22,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ PREFERRED_VERSION_xserver-xorg ?= "1.9.3" PREFERRED_VERSION_mesa-dri ?= "8.0.4" PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" +PREFERRED_VERSION_emgd-driver-bin ?= "1.16" APPEND += "video=vesafb vga=0x318 vmalloc=256MB" diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend index e8c90f9e..e1a7d0a7 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend @@ -4,19 +4,23 @@ COMPATIBLE_MACHINE_crownbay = "crownbay" KMACHINE_crownbay = "crownbay" KBRANCH_crownbay = "standard/crownbay" +KERNEL_FEATURES_crownbay_append = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb" + COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" KMACHINE_crownbay-noemgd = "crownbay" KBRANCH_crownbay-noemgd = "standard/crownbay" -SRCREV_machine_pn-linux-yocto_crownbay ?= "218bd8d2022b9852c60d32f0d770931e3cf343e2" -SRCREV_meta_pn-linux-yocto_crownbay ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f" -SRCREV_emgd_pn-linux-yocto_crownbay ?= "86643bdd8cbad616a161ab91f51108cf0da827bc" +KERNEL_FEATURES_crownbay-noemgd_append = " cfg/vesafb" + +SRCREV_machine_pn-linux-yocto_crownbay ?= "840bb8c059418c4753415df56c9aff1c0d5354c8" +SRCREV_meta_pn-linux-yocto_crownbay ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993" +SRCREV_emgd_pn-linux-yocto_crownbay ?= "f5c3a221f0e42d48ee5af369d73594e26ef7fae6" -SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "218bd8d2022b9852c60d32f0d770931e3cf343e2" -SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f" +SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "840bb8c059418c4753415df56c9aff1c0d5354c8" +SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993" KSRC_linux_yocto_3_4 ?= "git.yoctoproject.org/linux-yocto-3.4.git" -SRC_URI_crownbay = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta,emgd-1.14;name=machine,meta,emgd" +SRC_URI_crownbay = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta,emgd-1.16;name=machine,meta,emgd" SRC_URI_crownbay-noemgd = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" -LINUX_VERSION = "3.4.11" +LINUX_VERSION = "3.4.28" |