From 3eb5590b0d610e04ba0484c2c3a82882d576a05b Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Sun, 10 Mar 2013 21:11:29 -0500 Subject: 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 Signed-off-by: Richard Purdie --- .../{{=machine}}-preempt-rt.scc" | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.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 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}} 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 -- cgit v1.2.3-54-g00ecf