linux-yocto/meta-yocto: add machine aliases for yocto BSPs

To avoid mapping machine names to kernel machine names in recipes,
we can define multiple KMACHINE names for a single in tree board.
This allows the tools to match a board description to multiple
different MACHINEs.

As a result, we can remove the explicit KMACHINE mappings from
the linux-yocto recipes and allow the KMACHINE=${MACHINE} default
to handle mappings. Individual recipes an bbappends can override
this as required.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

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 2313034b54c197181f20547813be3ec21a3f5b4b..d0608bc0fec44eec6b2f1bedcd87ef7261e850e1 100644 (file)
--- a/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
@@ -3,9 +3,6 @@ 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 ?= "45d64709c00fce6e9b76a638c4ca6f30a8e9d25a"
 SRCREV_machine_routerstationpro ?= "21bd4a0a3b0f061e4640dd1011ebc94d122b5e40"
 SRCREV_machine_mpc8315e-rdb ?= "0c781e306559d5e9816e202a60aa2543f4eea39e"

diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_3.2.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto_3.2.bbappend
index 815650aec9263e15ffbacc0bed8aaea905b0172b..dfb019ba2cb8ea0fb41cfc23e8a420fc44294817 100644 (file)
--- a/meta-yocto/recipes-kernel/linux/linux-yocto_3.2.bbappend
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto_3.2.bbappend
@@ -1,8 +1,3 @@
-KMACHINE_atom-pc  = "atom-pc"
-KMACHINE_routerstationpro = "routerstationpro"
-KMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb"
-KMACHINE_beagleboard = "beagleboard"
-
 KBRANCH_atom-pc  = "standard/default/common-pc/atom-pc"
 KBRANCH_routerstationpro = "standard/default/routerstationpro"
 KBRANCH_mpc8315e-rdb = "standard/default/fsl-mpc8315e-rdb"