diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2013-03-10 21:11:29 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-17 23:10:27 +0000 |
commit | 3eb5590b0d610e04ba0484c2c3a82882d576a05b (patch) | |
tree | 529789303e514581cf26fb4705033b4784519b03 /scripts/lib/bsp/substrate | |
parent | 03a1091fa556b730c1a493029bf6a3fa7fe760fd (diff) | |
download | poky-3eb5590b0d610e04ba0484c2c3a82882d576a05b.tar.gz |
yocto-bsp: update machine-preempt-rt.scc
Simplify machine-standard.scc for all the templates.
(From meta-yocto rev: ad0d944698a854a281d0beea1c87a0600e98ccbd)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/bsp/substrate')
6 files changed, 17 insertions, 30 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc index 22ff307b91..de0bff28a3 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc | |||
@@ -2,7 +2,8 @@ define KMACHINE {{=machine}} | |||
2 | define KTYPE preempt-rt | 2 | define KTYPE preempt-rt |
3 | define KARCH arm | 3 | define KARCH arm |
4 | 4 | ||
5 | # no new branch required, re-use the ktypes/preempt-rt branch | 5 | include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} |
6 | include ktypes/preempt-rt | 6 | {{ if need_new_kbranch == "y": }} |
7 | branch {{=machine}} | ||
7 | 8 | ||
8 | include {{=machine}}.scc | 9 | include {{=machine}}.scc |
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc index 2734d336bd..bfefb0d0a0 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc | |||
@@ -2,8 +2,9 @@ define KMACHINE {{=machine}} | |||
2 | define KTYPE preempt-rt | 2 | define KTYPE preempt-rt |
3 | define KARCH i386 | 3 | define KARCH i386 |
4 | 4 | ||
5 | # no new branch required, re-use the ktypes/preempt-rt branch | 5 | include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} |
6 | include ktypes/preempt-rt | 6 | {{ if need_new_kbranch == "y": }} |
7 | branch {{=machine}} | ||
7 | 8 | ||
8 | include {{=machine}}.scc | 9 | include {{=machine}}.scc |
9 | 10 | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc index 792c4d5825..b0fb63ac6a 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc +++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc | |||
@@ -2,7 +2,8 @@ define KMACHINE {{=machine}} | |||
2 | define KTYPE preempt-rt | 2 | define KTYPE preempt-rt |
3 | define KARCH mips | 3 | define KARCH mips |
4 | 4 | ||
5 | # no new branch required, re-use the ktypes/preempt-rt branch | 5 | include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} |
6 | include ktypes/preempt-rt | 6 | {{ if need_new_kbranch == "y": }} |
7 | branch {{=machine}} | ||
7 | 8 | ||
8 | include {{=machine}}.scc | 9 | include {{=machine}}.scc |
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc index 4a182a38e8..1da7b0c892 100644 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc | |||
@@ -2,7 +2,8 @@ define KMACHINE {{=machine}} | |||
2 | define KTYPE preempt-rt | 2 | define KTYPE preempt-rt |
3 | define KARCH powerpc | 3 | define KARCH powerpc |
4 | 4 | ||
5 | # no new branch required, re-use the ktypes/preempt-rt branch | 5 | include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} |
6 | include ktypes/preempt-rt | 6 | {{ if need_new_kbranch == "y": }} |
7 | branch {{=machine}} | ||
7 | 8 | ||
8 | include {{=machine}}.scc | 9 | include {{=machine}}.scc |
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc index 0f5a582446..af34437d0a 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc | |||
@@ -1,26 +1,8 @@ | |||
1 | define KMACHINE {{=machine}} | 1 | define KMACHINE {{=machine}} |
2 | define KTYPE preempt-rt | 2 | define KTYPE preempt-rt |
3 | {{ if qemuarch == "i386": }} | 3 | define KARCH {{=qemuarch}} |
4 | define KARCH i386 | ||
5 | {{ if qemuarch == "x86_64": }} | ||
6 | define KARCH x86_64 | ||
7 | {{ if qemuarch == "arm": }} | ||
8 | define KARCH arm | ||
9 | {{ if qemuarch == "powerpc": }} | ||
10 | define KARCH powerpc | ||
11 | {{ if qemuarch == "mips": }} | ||
12 | define KARCH mips | ||
13 | 4 | ||
14 | {{ if qemuarch == "i386": }} | 5 | include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} |
15 | include bsp/common-pc/common-pc-preempt-rt | ||
16 | {{ if qemuarch == "x86_64": }} | ||
17 | include bsp/common-pc-64/common-pc-64-preempt-rt | ||
18 | {{ if qemuarch == "arm": }} | ||
19 | include bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt | ||
20 | {{ if qemuarch == "powerpc": }} | ||
21 | include bsp/qemu-ppc32/qemu-ppc32-rt | ||
22 | {{ if qemuarch == "mips": }} | ||
23 | include bsp/mti-malta32/mti-malta32-be-preempt-rt | ||
24 | {{ if need_new_kbranch == "y": }} | 6 | {{ if need_new_kbranch == "y": }} |
25 | branch {{=machine}} | 7 | branch {{=machine}} |
26 | 8 | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc index de9906af86..c9882590a8 100644 --- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc +++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc | |||
@@ -2,8 +2,9 @@ define KMACHINE {{=machine}} | |||
2 | define KTYPE preempt-rt | 2 | define KTYPE preempt-rt |
3 | define KARCH x86_64 | 3 | define KARCH x86_64 |
4 | 4 | ||
5 | # no new branch required, re-use the ktypes/preempt-rt branch | 5 | include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} |
6 | include ktypes/preempt-rt | 6 | {{ if need_new_kbranch == "y": }} |
7 | branch {{=machine}} | ||
7 | 8 | ||
8 | include {{=machine}}.scc | 9 | include {{=machine}}.scc |
9 | 10 | ||