From 8a51a8afe873bbdab8ca86354ea759b7b31fd811 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Sun, 5 Aug 2012 16:28:41 -0500 Subject: yocto-bsp: use standard branch mapping in bsp templates Signed-off-by: Tom Zanussi --- .../arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc | 2 +- .../arch/qemu/recipes-kernel/linux/files/{{=machine}}-standard.scc | 4 ++-- .../arch/x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts') 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}} define KTYPE standard define KARCH i386 -include ktypes/standard +include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} branch {{=machine}} 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 define KARCH mips {{ if qemuarch == "i386": }} -include bsp/common-pc/common-pc-standard +include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} branch {{=machine}} {{ if qemuarch == "x86_64": }} -include bsp/common-pc-64/common-pc-64-standard +include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} branch {{=machine}} {{ if qemuarch == "arm": }} 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}} define KTYPE standard define KARCH x86_64 -include bsp/common-pc-64/common-pc-64-standard +include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} branch {{=machine}} include {{=machine}}.scc -- cgit v1.2.3-54-g00ecf