diff options
| author | Tom Zanussi <tom.zanussi@intel.com> | 2012-08-05 16:28:41 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-25 14:47:03 +0100 |
| commit | f32909a2c26db5b09a11fff4103b71c84d342017 (patch) | |
| tree | fbe14113a2b53990366cebd0b95c9b81df71fd5b /scripts/lib | |
| parent | 859e0e74c082714821c82df9f42d0a605049121d (diff) | |
| download | poky-f32909a2c26db5b09a11fff4103b71c84d342017.tar.gz | |
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>
Diffstat (limited to 'scripts/lib')
3 files changed, 4 insertions, 4 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc index 28c353bf35..c7ba1fba6f 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc | |||
| @@ -2,7 +2,7 @@ define KMACHINE {{=machine}} | |||
| 2 | define KTYPE standard | 2 | define KTYPE standard |
| 3 | define KARCH i386 | 3 | define KARCH i386 |
| 4 | 4 | ||
| 5 | include ktypes/standard | 5 | include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} |
| 6 | branch {{=machine}} | 6 | branch {{=machine}} |
| 7 | 7 | ||
| 8 | include {{=machine}}.scc | 8 | include {{=machine}}.scc |
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-standard.scc b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-standard.scc index 9ed66c3ebf..4def04ac7b 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-standard.scc | |||
| @@ -12,10 +12,10 @@ define KARCH powerpc | |||
| 12 | define KARCH mips | 12 | define KARCH mips |
| 13 | 13 | ||
| 14 | {{ if qemuarch == "i386": }} | 14 | {{ if qemuarch == "i386": }} |
| 15 | include bsp/common-pc/common-pc-standard | 15 | include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} |
| 16 | branch {{=machine}} | 16 | branch {{=machine}} |
| 17 | {{ if qemuarch == "x86_64": }} | 17 | {{ if qemuarch == "x86_64": }} |
| 18 | include bsp/common-pc-64/common-pc-64-standard | 18 | include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} |
| 19 | branch {{=machine}} | 19 | branch {{=machine}} |
| 20 | {{ if qemuarch == "arm": }} | 20 | {{ if qemuarch == "arm": }} |
| 21 | include bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard | 21 | include bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard |
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc index 2a32fea9cf..4a034fafd9 100644 --- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc | |||
| @@ -2,7 +2,7 @@ define KMACHINE {{=machine}} | |||
| 2 | define KTYPE standard | 2 | define KTYPE standard |
| 3 | define KARCH x86_64 | 3 | define KARCH x86_64 |
| 4 | 4 | ||
| 5 | include bsp/common-pc-64/common-pc-64-standard | 5 | include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} |
| 6 | branch {{=machine}} | 6 | branch {{=machine}} |
| 7 | 7 | ||
| 8 | include {{=machine}}.scc | 8 | include {{=machine}}.scc |