diff options
| author | George Nita <george.nita@enea.com> | 2014-05-06 05:26:24 +0200 |
|---|---|---|
| committer | George Nita <george.nita@enea.com> | 2014-05-06 05:26:24 +0200 |
| commit | 5d98064044ef8588ad7c884c8f0feb34e8bdbb9d (patch) | |
| tree | ee5a6d18181e192b9089f189561ccd134410897e /meta-fri2 | |
| parent | 5d093e6f841cc82f072fd1b19573628392ca640a (diff) | |
| parent | d8e9e84375949ea82dadf214a04e94a2f871f5ce (diff) | |
| download | meta-intel-5d98064044ef8588ad7c884c8f0feb34e8bdbb9d.tar.gz | |
Merge remote-tracking branch 'origin/daisy' into daisy-eneaenea-linux-4.0-rt-test1enea-linux-4.0-rc3enea-linux-4.0daisy-enea-mandaisy-enea
Diffstat (limited to 'meta-fri2')
| -rw-r--r-- | meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend index c1be2433..8c442abe 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend | |||
| @@ -4,9 +4,9 @@ COMPATIBLE_MACHINE_fri2 = "fri2" | |||
| 4 | KMACHINE_fri2 = "fri2" | 4 | KMACHINE_fri2 = "fri2" |
| 5 | KBRANCH_fri2 = "standard/fri2" | 5 | KBRANCH_fri2 = "standard/fri2" |
| 6 | KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" | 6 | KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" |
| 7 | LINUX_VERSION_fri2 = "3.10.35" | 7 | LINUX_VERSION_fri2 = "3.10.38" |
| 8 | SRCREV_meta_fri2 = "b6e58b33dd427fe471f8827c83e311acdf4558a4" | 8 | SRCREV_meta_fri2 = "1eb79862c2959cfa305773e7f785d6d1810bf190" |
| 9 | SRCREV_machine_fri2 = "cee957655fe67826b2e827e2db41f156fa8f0cc4" | 9 | SRCREV_machine_fri2 = "02f7e63e56c061617957388c23bd5cf9b05c5388" |
| 10 | SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" | 10 | SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" |
| 11 | SRC_URI_fri2 = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd" | 11 | SRC_URI_fri2 = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd" |
| 12 | 12 | ||
| @@ -14,9 +14,9 @@ COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" | |||
| 14 | KMACHINE_fri2-noemgd = "fri2" | 14 | KMACHINE_fri2-noemgd = "fri2" |
| 15 | KBRANCH_fri2-noemgd = "standard/fri2" | 15 | KBRANCH_fri2-noemgd = "standard/fri2" |
| 16 | KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" | 16 | KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" |
| 17 | LINUX_VERSION_fri2-noemgd = "3.10.35" | 17 | LINUX_VERSION_fri2-noemgd = "3.10.38" |
| 18 | SRCREV_meta_fri2-noemgd = "b6e58b33dd427fe471f8827c83e311acdf4558a4" | 18 | SRCREV_meta_fri2-noemgd = "1eb79862c2959cfa305773e7f785d6d1810bf190" |
| 19 | SRCREV_machine_fri2-noemgd = "cee957655fe67826b2e827e2db41f156fa8f0cc4" | 19 | SRCREV_machine_fri2-noemgd = "02f7e63e56c061617957388c23bd5cf9b05c5388" |
| 20 | 20 | ||
| 21 | module_autoload_iwlwifi = "iwlwifi" | 21 | module_autoload_iwlwifi = "iwlwifi" |
| 22 | 22 | ||