diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2015-02-27 09:33:44 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-24 10:06:03 +0000 |
commit | 369932178fe9e7aa4a6d0e2ef1e2e539be701d02 (patch) | |
tree | 416781934dfac975b3ea044813ba995964bd66a4 /scripts/lib/bsp/substrate/target/arch/mips | |
parent | 4bd886fb0081954879aaa2f574f3c7f6ced745d5 (diff) | |
download | poky-369932178fe9e7aa4a6d0e2ef1e2e539be701d02.tar.gz |
yocto-bsp: Update templates to 3.19 kernel
Add 3.19 kernel support and remove 3.10 and 3.17 support.
'Fixes' [YOCTO #7391].
(From meta-yocto rev: fe9b3c567230e815f528431f1098626669a9568f)
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/mips')
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/kernel-list.noinstall | 4 | ||||
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend | 33 | ||||
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend | 33 | ||||
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend (renamed from scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_3.17.bbappend) | 4 | ||||
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.10.bbappend | 33 | ||||
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.19.bbappend (renamed from scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.17.bbappend) | 4 |
6 files changed, 6 insertions, 105 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/kernel-list.noinstall b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/kernel-list.noinstall index 8903a823aa..811d695478 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/kernel-list.noinstall +++ b/scripts/lib/bsp/substrate/target/arch/mips/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.17) kernel? (y/n)" default:"y"}} | 2 | {{ input type:"boolean" name:"use_default_kernel" prio:"10" msg:"Would you like to use the default (3.19) 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.17"}} | 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.19"}} |
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend deleted file mode 100644 index 35b0958582..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto-rt_3.10": }} this | ||
2 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | ||
3 | |||
4 | PR := "${PR}.1" | ||
5 | |||
6 | COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | ||
7 | |||
8 | {{ 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" }} | ||
9 | |||
10 | {{ if need_new_kbranch == "y": }} | ||
11 | {{ 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" }} | ||
12 | |||
13 | {{ if need_new_kbranch == "n": }} | ||
14 | {{ 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" }} | ||
15 | |||
16 | {{ if need_new_kbranch == "n": }} | ||
17 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | ||
18 | |||
19 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} | ||
20 | {{ if smp == "y": }} | ||
21 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | ||
22 | |||
23 | SRC_URI += "file://{{=machine}}-preempt-rt.scc \ | ||
24 | file://{{=machine}}-user-config.cfg \ | ||
25 | file://{{=machine}}-user-patches.scc \ | ||
26 | file://{{=machine}}-user-features.scc \ | ||
27 | " | ||
28 | |||
29 | # uncomment and replace these SRCREVs with the real commit ids once you've had | ||
30 | # the appropriate changes committed to the upstream linux-yocto repo | ||
31 | #SRCREV_machine_pn-linux-yocto-rt_{{=machine}} ?= "f35992f80c81dc5fa1a97165dfd5cbb84661f7cb" | ||
32 | #SRCREV_meta_pn-linux-yocto-rt_{{=machine}} ?= "1b534b2f8bbe9b8a773268cfa30a4850346f6f5f" | ||
33 | #LINUX_VERSION = "3.10.9" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend deleted file mode 100644 index f04dd0cce4..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto-tiny_3.10": }} this | ||
2 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | ||
3 | |||
4 | PR := "${PR}.1" | ||
5 | |||
6 | COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | ||
7 | |||
8 | {{ 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" }} | ||
9 | |||
10 | {{ if need_new_kbranch == "y": }} | ||
11 | {{ input type:"choicelist" name:"new_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/tiny" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/tiny/base" }} | ||
12 | |||
13 | {{ if need_new_kbranch == "n": }} | ||
14 | {{ input type:"choicelist" name:"existing_kbranch" gen:"bsp.kernel.all_branches" branches_base:"standard/tiny" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/tiny/base" }} | ||
15 | |||
16 | {{ if need_new_kbranch == "n": }} | ||
17 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | ||
18 | |||
19 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} | ||
20 | {{ if smp == "y": }} | ||
21 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | ||
22 | |||
23 | SRC_URI += "file://{{=machine}}-tiny.scc \ | ||
24 | file://{{=machine}}-user-config.cfg \ | ||
25 | file://{{=machine}}-user-patches.scc \ | ||
26 | file://{{=machine}}-user-features.scc \ | ||
27 | " | ||
28 | |||
29 | # uncomment and replace these SRCREVs with the real commit ids once you've had | ||
30 | # the appropriate changes committed to the upstream linux-yocto repo | ||
31 | #SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "840bb8c059418c4753415df56c9aff1c0d5354c8" | ||
32 | #SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993" | ||
33 | #LINUX_VERSION = "3.10.9" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_3.17.bbappend b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend index 142e38b3bc..a9ba0ae457 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_3.17.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto-tiny_3.17": }} this | 1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto-tiny_3.19": }} this |
2 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | 2 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" |
3 | 3 | ||
4 | PR := "${PR}.1" | 4 | PR := "${PR}.1" |
@@ -30,4 +30,4 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ | |||
30 | # the appropriate changes committed to the upstream linux-yocto repo | 30 | # the appropriate changes committed to the upstream linux-yocto repo |
31 | #SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "840bb8c059418c4753415df56c9aff1c0d5354c8" | 31 | #SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "840bb8c059418c4753415df56c9aff1c0d5354c8" |
32 | #SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993" | 32 | #SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993" |
33 | #LINUX_VERSION = "3.17" \ No newline at end of file | 33 | #LINUX_VERSION = "3.19" \ No newline at end of file |
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.10.bbappend b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.10.bbappend deleted file mode 100644 index badb3aa239..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto_3.10": }} this | ||
2 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | ||
3 | |||
4 | PR := "${PR}.1" | ||
5 | |||
6 | COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | ||
7 | |||
8 | {{ 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" }} | ||
9 | |||
10 | {{ if need_new_kbranch == "y": }} | ||
11 | {{ 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" }} | ||
12 | |||
13 | {{ if need_new_kbranch == "n": }} | ||
14 | {{ 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" }} | ||
15 | |||
16 | {{ if need_new_kbranch == "n": }} | ||
17 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | ||
18 | |||
19 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} | ||
20 | {{ if smp == "y": }} | ||
21 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | ||
22 | |||
23 | SRC_URI += "file://{{=machine}}-standard.scc \ | ||
24 | file://{{=machine}}-user-config.cfg \ | ||
25 | file://{{=machine}}-user-patches.scc \ | ||
26 | file://{{=machine}}-user-features.scc \ | ||
27 | " | ||
28 | |||
29 | # uncomment and replace these SRCREVs with the real commit ids once you've had | ||
30 | # the appropriate changes committed to the upstream linux-yocto repo | ||
31 | #SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "19f7e43b54aef08d58135ed2a897d77b624b320a" | ||
32 | #SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "459165c1dd61c4e843c36e6a1abeb30949a20ba7" | ||
33 | #LINUX_VERSION = "3.10.9" \ No newline at end of file | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.17.bbappend b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.19.bbappend index 72af58afc1..97e1bb8432 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.17.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_3.19.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto_3.17": }} this | 1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto_3.19": }} this |
2 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | 2 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" |
3 | 3 | ||
4 | PR := "${PR}.1" | 4 | PR := "${PR}.1" |
@@ -30,4 +30,4 @@ SRC_URI += "file://{{=machine}}-standard.scc \ | |||
30 | # the appropriate changes committed to the upstream linux-yocto repo | 30 | # the appropriate changes committed to the upstream linux-yocto repo |
31 | #SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "840bb8c059418c4753415df56c9aff1c0d5354c8" | 31 | #SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "840bb8c059418c4753415df56c9aff1c0d5354c8" |
32 | #SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993" | 32 | #SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993" |
33 | #LINUX_VERSION = "3.17" \ No newline at end of file | 33 | #LINUX_VERSION = "3.19" \ No newline at end of file |