diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2013-02-28 00:27:16 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-17 23:10:26 +0000 |
commit | 32a3d0dfdef7551fcf83eeaaca89f6415b127585 (patch) | |
tree | bbeaeef3505b0da6aa70e9a49801abe27597caaa /scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux | |
parent | b76d07945e08d9aeb3aa14c6935e5263db1909dc (diff) | |
download | poky-32a3d0dfdef7551fcf83eeaaca89f6415b127585.tar.gz |
yocto-bsp: add 3.8/remove 3.2 kernel from templates
For Yocto 1.4, 3.8 is the preferred kernel and 3.2 is obsolete.
(From meta-yocto rev: 5b07921319901a3709492c43397c57bbd2201585)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux')
4 files changed, 53 insertions, 124 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/kernel-list.noinstall b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/kernel-list.noinstall index e2b13ac5c7..6754c6df44 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/kernel-list.noinstall +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/kernel-list.noinstall | |||
@@ -1,5 +1,5 @@ | |||
1 | {{ if kernel_choice != "custom": }} | 1 | {{ if kernel_choice != "custom": }} |
2 | {{ input type:"boolean" name:"use_default_kernel" prio:"10" msg:"Would you like to use the default (3.4) kernel? (y/n)" default:"y"}} | 2 | {{ input type:"boolean" name:"use_default_kernel" prio:"10" msg:"Would you like to use the default (3.8) kernel? (y/n)" default:"y"}} |
3 | 3 | ||
4 | {{ if kernel_choice != "custom" and use_default_kernel == "n": }} | 4 | {{ if kernel_choice != "custom" and use_default_kernel == "n": }} |
5 | {{ input type:"choicelist" name:"kernel_choice" gen:"bsp.kernel.kernels" prio:"10" msg:"Please choose the kernel to use in this BSP:" default:"linux-yocto_3.4"}} | 5 | {{ input type:"choicelist" name:"kernel_choice" gen:"bsp.kernel.kernels" prio:"10" msg:"Please choose the kernel to use in this BSP:" default:"linux-yocto_3.8"}} |
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend deleted file mode 100644 index e580841da0..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:" | ||
2 | |||
3 | PR := "${PR}.1" | ||
4 | |||
5 | COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | ||
6 | |||
7 | {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} | ||
8 | |||
9 | {{ if need_new_kbranch == "y" and qemuarch == "arm": }} | ||
10 | {{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} | ||
11 | |||
12 | {{ if need_new_kbranch == "n" and qemuarch == "arm": }} | ||
13 | {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} | ||
14 | |||
15 | {{ if need_new_kbranch == "y" and qemuarch == "powerpc": }} | ||
16 | {{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} | ||
17 | |||
18 | {{ if need_new_kbranch == "n" and qemuarch == "powerpc": }} | ||
19 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/qemu-ppc32" }} | ||
20 | |||
21 | {{ if need_new_kbranch == "y" and qemuarch == "i386": }} | ||
22 | {{ input type:"choicelist" name:"new_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} | ||
23 | |||
24 | {{ if need_new_kbranch == "n" and qemuarch == "i386": }} | ||
25 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} | ||
26 | |||
27 | {{ if need_new_kbranch == "y" and qemuarch == "x86_64": }} | ||
28 | {{ input type:"choicelist" name:"new_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} | ||
29 | |||
30 | {{ if need_new_kbranch == "n" and qemuarch == "x86_64": }} | ||
31 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} | ||
32 | |||
33 | {{ if need_new_kbranch == "y" and qemuarch == "mips": }} | ||
34 | {{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} | ||
35 | |||
36 | {{ if need_new_kbranch == "n" and qemuarch == "mips": }} | ||
37 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} | ||
38 | |||
39 | {{ if need_new_kbranch == "y": }} | ||
40 | KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" | ||
41 | KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}" | ||
42 | {{ if need_new_kbranch == "n": }} | ||
43 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | ||
44 | |||
45 | KMACHINE_{{=machine}} = "{{=machine}}" | ||
46 | |||
47 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} | ||
48 | {{ if smp == "y": }} | ||
49 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | ||
50 | |||
51 | SRC_URI += "file://{{=machine}}-preempt-rt.scc \ | ||
52 | file://{{=machine}}.scc \ | ||
53 | file://{{=machine}}.cfg \ | ||
54 | file://{{=machine}}-user-config.cfg \ | ||
55 | file://{{=machine}}-user-patches.scc \ | ||
56 | " | ||
57 | |||
58 | # uncomment and replace these SRCREVs with the real commit ids once you've had | ||
59 | # the appropriate changes committed to the upstream linux-yocto repo | ||
60 | #SRCREV_machine_pn-linux-yocto-rt_{{=machine}} ?= "417fc778a86e81303bab5883b919ee422ec51c04" | ||
61 | #SRCREV_meta_pn-linux-yocto-rt_{{=machine}} ?= "138bf5b502607fe40315c0d76822318d77d97e01" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend deleted file mode 100644 index 93cbbb9443..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:" | ||
2 | |||
3 | PR := "${PR}.1" | ||
4 | |||
5 | COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | ||
6 | |||
7 | {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} | ||
8 | |||
9 | {{ if need_new_kbranch == "y" and qemuarch == "arm": }} | ||
10 | {{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} | ||
11 | |||
12 | {{ if need_new_kbranch == "n" and qemuarch == "arm": }} | ||
13 | {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/arm-versatile-926ejs" }} | ||
14 | |||
15 | {{ if need_new_kbranch == "y" and qemuarch == "powerpc": }} | ||
16 | {{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} | ||
17 | |||
18 | {{ if need_new_kbranch == "n" and qemuarch == "powerpc": }} | ||
19 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/qemu-ppc32" }} | ||
20 | |||
21 | {{ if need_new_kbranch == "y" and qemuarch == "i386": }} | ||
22 | {{ input type:"choicelist" name:"new_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" branches_base:"standard/default:standard/default/common-pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc/base" }} | ||
23 | |||
24 | {{ if need_new_kbranch == "n" and qemuarch == "i386": }} | ||
25 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" branches_base:"standard/default:standard/default/common-pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc/base" }} | ||
26 | |||
27 | {{ if need_new_kbranch == "y" and qemuarch == "x86_64": }} | ||
28 | {{ input type:"choicelist" name:"new_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" branches_base:"standard/default:standard/default/common-pc-64" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc-64/base" }} | ||
29 | |||
30 | {{ if need_new_kbranch == "n" and qemuarch == "x86_64": }} | ||
31 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" branches_base:"standard/default:standard/default/common-pc-64" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/common-pc-64/base" }} | ||
32 | |||
33 | {{ if need_new_kbranch == "y" and qemuarch == "mips": }} | ||
34 | {{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/base" }} | ||
35 | |||
36 | {{ if need_new_kbranch == "n" and qemuarch == "mips": }} | ||
37 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"standard/default" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/default/mti-malta32-be" }} | ||
38 | |||
39 | {{ if need_new_kbranch == "y": }} | ||
40 | KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" | ||
41 | KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}" | ||
42 | {{ if need_new_kbranch == "n": }} | ||
43 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | ||
44 | |||
45 | KMACHINE_{{=machine}} = "{{=machine}}" | ||
46 | |||
47 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} | ||
48 | {{ if smp == "y": }} | ||
49 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | ||
50 | |||
51 | SRC_URI += "file://{{=machine}}-standard.scc \ | ||
52 | file://{{=machine}}.scc \ | ||
53 | file://{{=machine}}.cfg \ | ||
54 | file://{{=machine}}-user-config.cfg \ | ||
55 | file://{{=machine}}-user-patches.scc \ | ||
56 | " | ||
57 | |||
58 | # uncomment and replace these SRCREVs with the real commit ids once you've had | ||
59 | # the appropriate changes committed to the upstream linux-yocto repo | ||
60 | #SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "417fc778a86e81303bab5883b919ee422ec51c04" | ||
61 | #SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "138bf5b502607fe40315c0d76822318d77d97e01" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.8": }} linux-yocto_3.8.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.8": }} linux-yocto_3.8.bbappend new file mode 100644 index 0000000000..c696e080b4 --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.8": }} linux-yocto_3.8.bbappend | |||
@@ -0,0 +1,51 @@ | |||
1 | FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:" | ||
2 | |||
3 | PR := "${PR}.1" | ||
4 | |||
5 | COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | ||
6 | {{ input type:"boolean" name:"need_new_kbranch" prio:"20" msg:"Do you need a new machine branch for this BSP (the alternative is to re-use an existing branch)? [y/n]" default:"y" }} | ||
7 | |||
8 | {{ if need_new_kbranch == "y" and qemuarch == "arm": }} | ||
9 | {{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20" msg:"Please choose a machine branch to base your new BSP branch on:" default:"standard/base" }} | ||
10 | |||
11 | {{ if need_new_kbranch == "n" and qemuarch == "arm": }} | ||
12 | {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20" msg:"Please choose an existing machine branch to use for this BSP:" default:"standard/arm-versatile-926ejs" }} | ||
13 | |||
14 | {{ if need_new_kbranch == "y" and qemuarch == "powerpc": }} | ||
15 | {{ input type:"choicelist" name:"new_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/base" }} | ||
16 | |||
17 | {{ if need_new_kbranch == "n" and qemuarch == "powerpc": }} | ||
18 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"powerpc" gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/qemu-ppc32" }} | ||
19 | |||
20 | {{ if need_new_kbranch == "y" and qemuarch == "i386": }} | ||
21 | {{ input type:"choicelist" name:"new_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" branches_base:"standard:standard/common-pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/common-pc/base" }} | ||
22 | |||
23 | {{ if need_new_kbranch == "n" and qemuarch == "i386": }} | ||
24 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"i386" gen:"bsp.kernel.all_branches" branches_base:"standard:standard/common-pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/common-pc/base" }} | ||
25 | |||
26 | {{ if need_new_kbranch == "y" and qemuarch == "x86_64": }} | ||
27 | {{ input type:"choicelist" name:"new_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" branches_base:"standard:standard/common-pc-64" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/common-pc-64/base" }} | ||
28 | |||
29 | {{ if need_new_kbranch == "n" and qemuarch == "x86_64": }} | ||
30 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"x86_64" gen:"bsp.kernel.all_branches" branches_base:"standard:standard/common-pc-64" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/common-pc-64/base" }} | ||
31 | |||
32 | {{ if need_new_kbranch == "y" and qemuarch == "mips": }} | ||
33 | {{ input type:"choicelist" name:"new_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/base" }} | ||
34 | |||
35 | {{ if need_new_kbranch == "n" and qemuarch == "mips": }} | ||
36 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/mti-malta32-be" }} | ||
37 | |||
38 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Would you like SMP support? (y/n)" default:"y"}} | ||
39 | {{ if smp == "y": }} | ||
40 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | ||
41 | |||
42 | SRC_URI += "file://{{=machine}}-standard.scc \ | ||
43 | file://{{=machine}}-user-config.cfg \ | ||
44 | file://{{=machine}}-user-patches.scc \ | ||
45 | " | ||
46 | |||
47 | # uncomment and replace these SRCREVs with the real commit ids once you've had | ||
48 | # the appropriate changes committed to the upstream linux-yocto repo | ||
49 | #SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "b170394a475b96ecc92cbc9e4b002bed0a9f69c5" | ||
50 | #SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "c2ed0f16fdec628242a682897d5d86df4547cf24" | ||
51 | #LINUX_VERSION = "3.8" | ||