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 | |
parent | 03a1091fa556b730c1a493029bf6a3fa7fe760fd (diff) | |
download | ast2050-yocto-poky-3eb5590b0d610e04ba0484c2c3a82882d576a05b.zip ast2050-yocto-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>
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 22ff307..de0bff2 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}} define KTYPE preempt-rt define KARCH arm -# no new branch required, re-use the ktypes/preempt-rt branch -include ktypes/preempt-rt +include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} +{{ if need_new_kbranch == "y": }} +branch {{=machine}} 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 2734d33..bfefb0d 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}} define KTYPE preempt-rt define KARCH i386 -# no new branch required, re-use the ktypes/preempt-rt branch -include ktypes/preempt-rt +include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} +{{ if need_new_kbranch == "y": }} +branch {{=machine}} include {{=machine}}.scc 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 792c4d5..b0fb63a 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}} define KTYPE preempt-rt define KARCH mips -# no new branch required, re-use the ktypes/preempt-rt branch -include ktypes/preempt-rt +include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} +{{ if need_new_kbranch == "y": }} +branch {{=machine}} 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 4a182a3..1da7b0c 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}} define KTYPE preempt-rt define KARCH powerpc -# no new branch required, re-use the ktypes/preempt-rt branch -include ktypes/preempt-rt +include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} +{{ if need_new_kbranch == "y": }} +branch {{=machine}} 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 0f5a582..af34437 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 @@ define KMACHINE {{=machine}} define KTYPE preempt-rt -{{ if qemuarch == "i386": }} -define KARCH i386 -{{ if qemuarch == "x86_64": }} -define KARCH x86_64 -{{ if qemuarch == "arm": }} -define KARCH arm -{{ if qemuarch == "powerpc": }} -define KARCH powerpc -{{ if qemuarch == "mips": }} -define KARCH mips +define KARCH {{=qemuarch}} -{{ if qemuarch == "i386": }} -include bsp/common-pc/common-pc-preempt-rt -{{ if qemuarch == "x86_64": }} -include bsp/common-pc-64/common-pc-64-preempt-rt -{{ if qemuarch == "arm": }} -include bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt -{{ if qemuarch == "powerpc": }} -include bsp/qemu-ppc32/qemu-ppc32-rt -{{ if qemuarch == "mips": }} -include bsp/mti-malta32/mti-malta32-be-preempt-rt +include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} {{ if need_new_kbranch == "y": }} branch {{=machine}} 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 de9906a..c988259 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}} define KTYPE preempt-rt define KARCH x86_64 -# no new branch required, re-use the ktypes/preempt-rt branch -include ktypes/preempt-rt +include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} +{{ if need_new_kbranch == "y": }} +branch {{=machine}} include {{=machine}}.scc |