summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2012-03-14 12:53:03 -0700
committerDarren Hart <dvhart@linux.intel.com>2012-03-20 11:19:27 -0700
commit9d3ed8034befd70b17a7f4faf3cfc39126251b58 (patch)
tree7be2e4d25043fea80f544ea1fc683f0f216c609e
parent9860bc55ffb8044bcf65fe0866cc76e6eef4e1ee (diff)
downloadmeta-intel-9d3ed8034befd70b17a7f4faf3cfc39126251b58.tar.gz
fri2: Update KMACHINE and KBRANCH variables
Specify only the machine itself in KMACHINE and set the branch explicitly. Use an fri2 specific branch in non-rt while we sort out whether or not to create these dynamically or not. Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend9
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto_3.0.bbappend14
2 files changed, 8 insertions, 15 deletions
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
index 3af58917..45631015 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
@@ -1,10 +1,9 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
2COMPATIBLE_MACHINE_fri2 = "fri2" 3COMPATIBLE_MACHINE_fri2 = "fri2"
3KMACHINE_fri2 = "fri2" 4KMACHINE_fri2 = "fri2"
5KBRANCH_fri2 = "yocto/standard/preempt-rt/base"
6
4COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" 7COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
5KMACHINE_fri2-noemgd = "fri2" 8KMACHINE_fri2-noemgd = "fri2"
6 9KBRANCH_fri2-noemgd = "yocto/standard/preempt-rt/base"
7# Update the following to use a different BSP branch or meta SRCREV
8#KBRANCH_fri2 = "yocto/standard/preempt-rt/base"
9#SRCREV_machine_pn-linux-yocto-rt_fri2 ?= XXXX
10#SRCREV_meta_pn-linux-yocto-rt_fri2 ?= XXXX
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.0.bbappend
index 205370ee..bacd6a58 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.0.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.0.bbappend
@@ -1,15 +1,9 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3COMPATIBLE_MACHINE_fri2 = "fri2" 3COMPATIBLE_MACHINE_fri2 = "fri2"
4KMACHINE_fri2 = "yocto/standard/fri2" 4KMACHINE_fri2 = "fri2"
5KERNEL_FEATURES_append_fri2 += " cfg/smp.scc cfg/efi-ext.scc" 5KBRANCH_fri2 = "yocto/standard/fri2"
6 6
7COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" 7COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
8KMACHINE_fri2-noemgd = "yocto/standard/fri2" 8KMACHINE_fri2-noemgd = "fri2"
9KERNEL_FEATURES_append_fri2-noemgd += " cfg/smp.scc cfg/efi-ext.scc" 9KBRANCH_fri2-noemgd = "yocto/standard/fri2"
10
11SRCREV_machine_pn-linux-yocto_fri2 ?= "16a35563a2a5cb3debc9d0666cbdc3b8d5d43b74"
12SRCREV_meta_pn-linux-yocto_fri2 ?= "59314a3523e360796419d76d78c6f7d8c5ef2593"
13
14SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "16a35563a2a5cb3debc9d0666cbdc3b8d5d43b74"
15SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "59314a3523e360796419d76d78c6f7d8c5ef2593"