summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2013-03-11 02:11:29 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-17 23:10:27 (GMT)
commit3eb5590b0d610e04ba0484c2c3a82882d576a05b (patch)
tree529789303e514581cf26fb4705033b4784519b03 /scripts/lib
parent03a1091fa556b730c1a493029bf6a3fa7fe760fd (diff)
downloadpoky-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')
-rw-r--r--scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc5
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc5
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc5
-rw-r--r--scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc5
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc22
-rw-r--r--scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc5
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}}
2define KTYPE preempt-rt 2define KTYPE preempt-rt
3define KARCH arm 3define KARCH arm
4 4
5# no new branch required, re-use the ktypes/preempt-rt branch 5include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
6include ktypes/preempt-rt 6{{ if need_new_kbranch == "y": }}
7branch {{=machine}}
7 8
8include {{=machine}}.scc 9include {{=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}}
2define KTYPE preempt-rt 2define KTYPE preempt-rt
3define KARCH i386 3define KARCH i386
4 4
5# no new branch required, re-use the ktypes/preempt-rt branch 5include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
6include ktypes/preempt-rt 6{{ if need_new_kbranch == "y": }}
7branch {{=machine}}
7 8
8include {{=machine}}.scc 9include {{=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 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}}
2define KTYPE preempt-rt 2define KTYPE preempt-rt
3define KARCH mips 3define KARCH mips
4 4
5# no new branch required, re-use the ktypes/preempt-rt branch 5include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
6include ktypes/preempt-rt 6{{ if need_new_kbranch == "y": }}
7branch {{=machine}}
7 8
8include {{=machine}}.scc 9include {{=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}}
2define KTYPE preempt-rt 2define KTYPE preempt-rt
3define KARCH powerpc 3define KARCH powerpc
4 4
5# no new branch required, re-use the ktypes/preempt-rt branch 5include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
6include ktypes/preempt-rt 6{{ if need_new_kbranch == "y": }}
7branch {{=machine}}
7 8
8include {{=machine}}.scc 9include {{=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 @@
1define KMACHINE {{=machine}} 1define KMACHINE {{=machine}}
2define KTYPE preempt-rt 2define KTYPE preempt-rt
3{{ if qemuarch == "i386": }} 3define KARCH {{=qemuarch}}
4define KARCH i386
5{{ if qemuarch == "x86_64": }}
6define KARCH x86_64
7{{ if qemuarch == "arm": }}
8define KARCH arm
9{{ if qemuarch == "powerpc": }}
10define KARCH powerpc
11{{ if qemuarch == "mips": }}
12define KARCH mips
13 4
14{{ if qemuarch == "i386": }} 5include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
15include bsp/common-pc/common-pc-preempt-rt
16{{ if qemuarch == "x86_64": }}
17include bsp/common-pc-64/common-pc-64-preempt-rt
18{{ if qemuarch == "arm": }}
19include bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt
20{{ if qemuarch == "powerpc": }}
21include bsp/qemu-ppc32/qemu-ppc32-rt
22{{ if qemuarch == "mips": }}
23include bsp/mti-malta32/mti-malta32-be-preempt-rt
24{{ if need_new_kbranch == "y": }} 6{{ if need_new_kbranch == "y": }}
25branch {{=machine}} 7branch {{=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 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}}
2define KTYPE preempt-rt 2define KTYPE preempt-rt
3define KARCH x86_64 3define KARCH x86_64
4 4
5# no new branch required, re-use the ktypes/preempt-rt branch 5include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
6include ktypes/preempt-rt 6{{ if need_new_kbranch == "y": }}
7branch {{=machine}}
7 8
8include {{=machine}}.scc 9include {{=machine}}.scc
9 10