diff options
author | Darren Hart <dvhart@linux.intel.com> | 2012-05-07 10:29:53 -0700 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2012-05-07 12:39:20 -0700 |
commit | 749a127f0b813d314c3515fc14dc144d0d44fcfb (patch) | |
tree | f0feb5718f31632876bf8e4de5f8a76a251a0ef4 /meta-fri2/recipes-kernel/linux | |
parent | 979231b9ddfce242b28301b3119ad7548b794aba (diff) | |
download | meta-intel-749a127f0b813d314c3515fc14dc144d0d44fcfb.tar.gz |
fri2: Update SRCREVs for 3.2 Kernel
Update the fri2 linux-yocto bbappends to take advantage of the recent
fri2 meta updates in the linux-yocto repository:
commit 72d9369a79ab91d6dba3ce95fa4769d75be5f1fa
Author: Darren Hart <dvhart@linux.intel.com>
Date: Tue May 1 15:13:26 2012 -0700
fri2: Cleanup fri2-$KTYPE.scc files re efi-ext.scc
The efi-ext.scc fragment is not part of the standard or preempt-rt
standard features. It is instead a BSP specific feature added to
these ktypes. Rearrange the meta-data accordingly.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
commit dbcb1205e3fb95b32f1856e4bf6745fe52f5e5f4
Author: Darren Hart <dvhart@linux.intel.com>
Date: Tue May 1 15:13:25 2012 -0700
fri2: Use emgd-1.10 feature and branch
Update the fri2-standard.scc description to use the new emgd feature
and branch name. Without this change the emgd driver is not merged
and not built.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'meta-fri2/recipes-kernel/linux')
-rw-r--r-- | meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend | 8 | ||||
-rw-r--r-- | meta-fri2/recipes-kernel/linux/linux-yocto_3.2.bbappend | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend index c43975fb..fea48518 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend | |||
@@ -2,10 +2,14 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | |||
2 | 2 | ||
3 | COMPATIBLE_MACHINE_fri2 = "fri2" | 3 | COMPATIBLE_MACHINE_fri2 = "fri2" |
4 | KMACHINE_fri2 = "fri2" | 4 | KMACHINE_fri2 = "fri2" |
5 | KBRANCH_fri2 = "standard/preempt-rt/base" | 5 | #KBRANCH_fri2 = "standard/preempt-rt/base" |
6 | SRCREV_machine_pn-linux-yocto_fri2 ?= "44e0381c0e0d46d3b9f171a58cb0ec5c2077b176" | ||
7 | SRCREV_meta_pn-linux-yocto_fri2 ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03" | ||
6 | 8 | ||
7 | COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" | 9 | COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" |
8 | KMACHINE_fri2-noemgd = "fri2" | 10 | KMACHINE_fri2-noemgd = "fri2" |
9 | KBRANCH_fri2-noemgd = "standard/preempt-rt/base" | 11 | #KBRANCH_fri2-noemgd = "standard/preempt-rt/base" |
12 | SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "44e0381c0e0d46d3b9f171a58cb0ec5c2077b176" | ||
13 | SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03" | ||
10 | 14 | ||
11 | module_autoload_iwlwifi = "iwlwifi" | 15 | module_autoload_iwlwifi = "iwlwifi" |
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.2.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.2.bbappend index c125e9a8..9622ce9e 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.2.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.2.bbappend | |||
@@ -3,9 +3,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | |||
3 | COMPATIBLE_MACHINE_fri2 = "fri2" | 3 | COMPATIBLE_MACHINE_fri2 = "fri2" |
4 | KMACHINE_fri2 = "fri2" | 4 | KMACHINE_fri2 = "fri2" |
5 | KBRANCH_fri2 = "standard/default/fri2" | 5 | KBRANCH_fri2 = "standard/default/fri2" |
6 | SRCREV_machine_pn-linux-yocto_fri2 ?= "44e0381c0e0d46d3b9f171a58cb0ec5c2077b176" | ||
7 | SRCREV_meta_pn-linux-yocto_fri2 ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03" | ||
6 | 8 | ||
7 | COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" | 9 | COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" |
8 | KMACHINE_fri2-noemgd = "fri2" | 10 | KMACHINE_fri2-noemgd = "fri2" |
9 | KBRANCH_fri2-noemgd = "standard/default/fri2" | 11 | KBRANCH_fri2-noemgd = "standard/default/fri2" |
12 | SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "44e0381c0e0d46d3b9f171a58cb0ec5c2077b176" | ||
13 | SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03" | ||
10 | 14 | ||
11 | module_autoload_iwlwifi = "iwlwifi" | 15 | module_autoload_iwlwifi = "iwlwifi" |