diff options
| author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2013-03-11 00:20:36 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-17 23:10:27 +0000 |
| commit | ead9ada172e93117f13812bd47aa2ed05dd5a2f3 (patch) | |
| tree | 1777f2c8a56dc19c2b0b071133be27bafff12666 /scripts | |
| parent | 64bdab9276a971c67597f93ff375a8c82d06ba87 (diff) | |
| download | poky-ead9ada172e93117f13812bd47aa2ed05dd5a2f3.tar.gz | |
yocto-bsp: use map_standard_branch()
Use map_standard_branch() instead of naming the branch directly.
(From meta-yocto rev: 34ec7d4cf53f82adb8de61969d0981344f9a1d87)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc index d13167850b..b12c50c90d 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc | |||
| @@ -2,7 +2,7 @@ define KMACHINE {{=machine}} | |||
| 2 | define KTYPE standard | 2 | define KTYPE standard |
| 3 | define KARCH arm | 3 | define KARCH arm |
| 4 | 4 | ||
| 5 | include ktypes/standard | 5 | include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} |
| 6 | {{ if need_new_kbranch == "y": }} | 6 | {{ if need_new_kbranch == "y": }} |
| 7 | branch {{=machine}} | 7 | branch {{=machine}} |
| 8 | 8 | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc index 3b916b4c33..326663a509 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc | |||
| @@ -2,7 +2,7 @@ define KMACHINE {{=machine}} | |||
| 2 | define KTYPE standard | 2 | define KTYPE standard |
| 3 | define KARCH mips | 3 | define KARCH mips |
| 4 | 4 | ||
| 5 | include ktypes/standard | 5 | include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} |
| 6 | {{ if need_new_kbranch == "y": }} | 6 | {{ if need_new_kbranch == "y": }} |
| 7 | branch {{=machine}} | 7 | branch {{=machine}} |
| 8 | 8 | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc index a521874f32..53a74a6ca2 100644 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc | |||
| @@ -2,7 +2,7 @@ define KMACHINE {{=machine}} | |||
| 2 | define KTYPE standard | 2 | define KTYPE standard |
| 3 | define KARCH powerpc | 3 | define KARCH powerpc |
| 4 | 4 | ||
| 5 | include ktypes/standard | 5 | include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} |
| 6 | {{ if need_new_kbranch == "y": }} | 6 | {{ if need_new_kbranch == "y": }} |
| 7 | branch {{=machine}} | 7 | branch {{=machine}} |
| 8 | 8 | ||