summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-08-05 16:28:41 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-21 11:35:21 +0100
commit8a51a8afe873bbdab8ca86354ea759b7b31fd811 (patch)
treed4010c52e40a2c6f550e4883db84d66a36f02f25 /scripts
parent2517376ee8f8b691089cad44d5505cd4461c414b (diff)
downloadpoky-8a51a8afe873bbdab8ca86354ea759b7b31fd811.tar.gz
yocto-bsp: use standard branch mapping in bsp templates
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc2
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-standard.scc4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc2
3 files changed, 4 insertions, 4 deletions
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}}
2define KTYPE standard 2define KTYPE standard
3define KARCH i386 3define KARCH i386
4 4
5include ktypes/standard 5include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
6branch {{=machine}} 6branch {{=machine}}
7 7
8include {{=machine}}.scc 8include {{=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
12define KARCH mips 12define KARCH mips
13 13
14{{ if qemuarch == "i386": }} 14{{ if qemuarch == "i386": }}
15include bsp/common-pc/common-pc-standard 15include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
16branch {{=machine}} 16branch {{=machine}}
17{{ if qemuarch == "x86_64": }} 17{{ if qemuarch == "x86_64": }}
18include bsp/common-pc-64/common-pc-64-standard 18include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
19branch {{=machine}} 19branch {{=machine}}
20{{ if qemuarch == "arm": }} 20{{ if qemuarch == "arm": }}
21include bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard 21include 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}}
2define KTYPE standard 2define KTYPE standard
3define KARCH x86_64 3define KARCH x86_64
4 4
5include bsp/common-pc-64/common-pc-64-standard 5include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
6branch {{=machine}} 6branch {{=machine}}
7 7
8include {{=machine}}.scc 8include {{=machine}}.scc