yocto-bsp: use standard branch mapping in bsp templates

(From meta-yocto rev: 716fdb4b1bd7cb91b07753b6747767ae55eeb1d2)

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tom Zanussi 2012-08-05 16:28:41 -05:00 committed by Richard Purdie
parent 859e0e74c0
commit f32909a2c2
3 changed files with 4 additions and 4 deletions

View File

@ -2,7 +2,7 @@ define KMACHINE {{=machine}}
define KTYPE standard
define KARCH i386
include ktypes/standard
include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
branch {{=machine}}
include {{=machine}}.scc

View File

@ -12,10 +12,10 @@ define KARCH powerpc
define KARCH mips
{{ if qemuarch == "i386": }}
include bsp/common-pc/common-pc-standard
include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
branch {{=machine}}
{{ if qemuarch == "x86_64": }}
include bsp/common-pc-64/common-pc-64-standard
include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
branch {{=machine}}
{{ if qemuarch == "arm": }}
include bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard

View File

@ -2,7 +2,7 @@ define KMACHINE {{=machine}}
define KTYPE standard
define KARCH x86_64
include bsp/common-pc-64/common-pc-64-standard
include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
branch {{=machine}}
include {{=machine}}.scc