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/powerpc/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/powerpc/recipes-kernel/linux')
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/kernel-list.noinstall | 4 | ||||
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc | 3 | ||||
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend | 37 | ||||
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.8": }} linux-yocto_3.8.bbappend (renamed from scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend) | 18 |
4 files changed, 6 insertions, 56 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/kernel-list.noinstall b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/kernel-list.noinstall index e2b13ac5c7..6754c6df44 100644 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/kernel-list.noinstall +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/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/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc index 0d64f58a18..c9fd468180 100644 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc | |||
@@ -1,9 +1,6 @@ | |||
1 | kconf hardware {{=machine}}.cfg | 1 | kconf hardware {{=machine}}.cfg |
2 | 2 | ||
3 | include cfg/usb-mass-storage.scc | 3 | include cfg/usb-mass-storage.scc |
4 | {{ if kernel_choice == "linux-yocto_3.2": }} | ||
5 | include cfg/vfat.scc | ||
6 | {{ if kernel_choice == "linux-yocto_3.4": }} | ||
7 | include cfg/fs/vfat.scc | 4 | include cfg/fs/vfat.scc |
8 | 5 | ||
9 | include cfg/dmaengine.scc | 6 | include cfg/dmaengine.scc |
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend deleted file mode 100644 index 296eb65f61..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.2": }} linux-yocto-rt_3.2.bbappend +++ /dev/null | |||
@@ -1,37 +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": }} | ||
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": }} | ||
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": }} | ||
16 | KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" | ||
17 | KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}" | ||
18 | {{ if need_new_kbranch == "n": }} | ||
19 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | ||
20 | |||
21 | KMACHINE_{{=machine}} = "{{=machine}}" | ||
22 | |||
23 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} | ||
24 | {{ if smp == "y": }} | ||
25 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | ||
26 | |||
27 | SRC_URI += "file://{{=machine}}-preempt-rt.scc \ | ||
28 | file://{{=machine}}.scc \ | ||
29 | file://{{=machine}}.cfg \ | ||
30 | file://{{=machine}}-user-config.cfg \ | ||
31 | file://{{=machine}}-user-patches.scc \ | ||
32 | " | ||
33 | |||
34 | # uncomment and replace these SRCREVs with the real commit ids once you've had | ||
35 | # the appropriate changes committed to the upstream linux-yocto repo | ||
36 | #SRCREV_machine_pn-linux-yocto-rt_{{=machine}} ?= "417fc778a86e81303bab5883b919ee422ec51c04" | ||
37 | #SRCREV_meta_pn-linux-yocto-rt_{{=machine}} ?= "138bf5b502607fe40315c0d76822318d77d97e01" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.8": }} linux-yocto_3.8.bbappend index 277aa9e780..cb24ffdb0e 100644 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.2": }} linux-yocto_3.2.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.8": }} linux-yocto_3.8.bbappend | |||
@@ -7,31 +7,21 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | |||
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" }} | 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 | 8 | ||
9 | {{ if need_new_kbranch == "y": }} | 9 | {{ if need_new_kbranch == "y": }} |
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" }} | 10 | {{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/base" }} |
11 | 11 | ||
12 | {{ if need_new_kbranch == "n": }} | 12 | {{ if need_new_kbranch == "n": }} |
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/base" }} | 13 | {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/base" }} |
14 | |||
15 | {{ if need_new_kbranch == "y": }} | ||
16 | KBRANCH_DEFAULT_{{=machine}} = "{{=strip_base(new_kbranch)}}/{{=machine}}" | ||
17 | KBRANCH_{{=machine}} = "${KBRANCH_DEFAULT}" | ||
18 | {{ if need_new_kbranch == "n": }} | ||
19 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | ||
20 | |||
21 | KMACHINE_{{=machine}} = "{{=machine}}" | ||
22 | 14 | ||
23 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} | 15 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} |
24 | {{ if smp == "y": }} | 16 | {{ if smp == "y": }} |
25 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | 17 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" |
26 | 18 | ||
27 | SRC_URI += "file://{{=machine}}-standard.scc \ | 19 | SRC_URI += "file://{{=machine}}-standard.scc \ |
28 | file://{{=machine}}.scc \ | ||
29 | file://{{=machine}}.cfg \ | ||
30 | file://{{=machine}}-user-config.cfg \ | 20 | file://{{=machine}}-user-config.cfg \ |
31 | file://{{=machine}}-user-patches.scc \ | 21 | file://{{=machine}}-user-patches.scc \ |
32 | " | 22 | " |
33 | 23 | ||
34 | # uncomment and replace these SRCREVs with the real commit ids once you've had | 24 | # uncomment and replace these SRCREVs with the real commit ids once you've had |
35 | # the appropriate changes committed to the upstream linux-yocto repo | 25 | # the appropriate changes committed to the upstream linux-yocto repo |
36 | #SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "417fc778a86e81303bab5883b919ee422ec51c04" | 26 | #SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "19f7e43b54aef08d58135ed2a897d77b624b320a" |
37 | #SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "138bf5b502607fe40315c0d76822318d77d97e01" | 27 | #SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "459165c1dd61c4e843c36e6a1abeb30949a20ba7" |