meta-yocto/linux-yocto-3.0: update branch mappings for new tools

Updates to the kern-tools to be more flexible and support multiple
upstream repository formats means that KMACHINE should really only
map to a machine and that KBRANCH should specify branch information.

To adapt to this change, we split the hardware reference boards into
KMACHINE and KBRANCH mappings.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
index 68c7cad840102520ab6a858a89760c5fb254875c..4c483ca9c59b5e90f974d034d38b367f4d20ca23 100644 (file)
--- a/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
@@ -1,8 +1,10 @@
-KMACHINE_atom-pc  = "yocto/standard/common-pc/atom-pc"
-KMACHINE_routerstationpro = "yocto/standard/routerstationpro"
-KMACHINE_mpc8315e-rdb = "yocto/standard/fsl-mpc8315e-rdb"
-KMACHINE_beagleboard = "yocto/standard/beagleboard"
+KBRANCH_atom-pc  = "yocto/standard/common-pc/atom-pc"
+KBRANCH_routerstationpro = "yocto/standard/routerstationpro"
+KBRANCH_mpc8315e-rdb = "yocto/standard/fsl-mpc8315e-rdb"
+KBRANCH_beagleboard = "yocto/standard/beagleboard"
 
+# temporary until 3.0 tree is updated to have machine mapping
+KMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb"
 
 SRCREV_machine_atom-pc ?= "afdda882f902dd28693cd8701a7d497958290f09"
 SRCREV_machine_routerstationpro ?= "220d89fcf345ee28fb0cdcf0f33f83b3dc7c460f"