[yocto] [PATCH 2/4] fri2: Update KMACHINE and KBRANCH variables

[Darren Hart]

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 at linux.intel.com>
---
 .../linux/linux-yocto-rt_3.0.bbappend              |    9 ++++-----
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |   14 ++++----------
 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 3af5891..4563101 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 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
 COMPATIBLE_MACHINE_fri2 = "fri2"
 KMACHINE_fri2 = "fri2"
+KBRANCH_fri2 = "yocto/standard/preempt-rt/base"
+
 COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
 KMACHINE_fri2-noemgd = "fri2"
-
-# Update the following to use a different BSP branch or meta SRCREV
-#KBRANCH_fri2 = "yocto/standard/preempt-rt/base"
-#SRCREV_machine_pn-linux-yocto-rt_fri2 ?= XXXX
-#SRCREV_meta_pn-linux-yocto-rt_fri2 ?= XXXX
+KBRANCH_fri2-noemgd = "yocto/standard/preempt-rt/base"
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 205370e..bacd6a5 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 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 COMPATIBLE_MACHINE_fri2 = "fri2"
-KMACHINE_fri2  = "yocto/standard/fri2"
-KERNEL_FEATURES_append_fri2 += " cfg/smp.scc cfg/efi-ext.scc"
+KMACHINE_fri2 = "fri2"
+KBRANCH_fri2 = "yocto/standard/fri2"
 
 COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
-KMACHINE_fri2-noemgd  = "yocto/standard/fri2"
-KERNEL_FEATURES_append_fri2-noemgd += " cfg/smp.scc cfg/efi-ext.scc"
-
-SRCREV_machine_pn-linux-yocto_fri2 ?= "16a35563a2a5cb3debc9d0666cbdc3b8d5d43b74"
-SRCREV_meta_pn-linux-yocto_fri2 ?= "59314a3523e360796419d76d78c6f7d8c5ef2593"
-
-SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "16a35563a2a5cb3debc9d0666cbdc3b8d5d43b74"
-SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "59314a3523e360796419d76d78c6f7d8c5ef2593"
+KMACHINE_fri2-noemgd = "fri2"
+KBRANCH_fri2-noemgd = "yocto/standard/fri2"
-- 
1.7.5.4