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 | |
| 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')
48 files changed, 114 insertions, 894 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/kernel-list.noinstall b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/kernel-list.noinstall index 8903a823aa..811d695478 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/kernel-list.noinstall +++ b/scripts/lib/bsp/substrate/target/arch/arm/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/arm/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend deleted file mode 100644 index 35b0958582..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/arm/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/arm/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend deleted file mode 100644 index f04dd0cce4..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/arm/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/arm/recipes-kernel/linux/linux-yocto-tiny_3.17.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend index fb4253271a..4de82fad00 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_3.17.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/arm/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" | 33 | #LINUX_VERSION = "3.19" |
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_3.10.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_3.10.bbappend deleted file mode 100644 index badb3aa239..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/arm/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/arm/recipes-kernel/linux/linux-yocto_3.17.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_3.19.bbappend index 72af58afc1..97e1bb8432 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_3.17.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/arm/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 |
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/machine.conf b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/machine.conf index e13dabc1e5..7189341909 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/machine.conf +++ b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/machine.conf | |||
| @@ -33,7 +33,7 @@ MACHINE_FEATURES += "wifi efi pcbios" | |||
| 33 | 33 | ||
| 34 | {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} | 34 | {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} |
| 35 | 35 | ||
| 36 | {{ if xserver == "y" and (kernel_choice == "linux-yocto_3.17" or kernel_choice == "linux-yocto_3.14" or kernel_choice == "linux-yocto_3.10"): }} | 36 | {{ if xserver == "y" and (kernel_choice == "linux-yocto_3.19" or kernel_choice == "linux-yocto_3.14"): }} |
| 37 | {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_vesa" }} | 37 | {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_vesa" }} |
| 38 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} | 38 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} |
| 39 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} | 39 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} |
| @@ -49,7 +49,7 @@ MACHINE_FEATURES += "wifi efi pcbios" | |||
| 49 | {{ input type:"choice" val:"xserver_fbdev" msg:"fbdev xserver support" }} | 49 | {{ input type:"choice" val:"xserver_fbdev" msg:"fbdev xserver support" }} |
| 50 | {{ input type:"choice" val:"xserver_modesetting" msg:"modesetting xserver support" }} | 50 | {{ input type:"choice" val:"xserver_modesetting" msg:"modesetting xserver support" }} |
| 51 | 51 | ||
| 52 | {{ if xserver == "y" and kernel_choice != "linux-yocto_3.17" and kernel_choice != "linux-yocto_3.14" and kernel_choice != "linux-yocto_3.10" and kernel_choice != "custom": xserver_choice = "xserver_i915" }} | 52 | {{ if xserver == "y" and kernel_choice != "linux-yocto_3.19" and kernel_choice != "linux-yocto_3.14" and kernel_choice != "custom": xserver_choice = "xserver_i915" }} |
| 53 | 53 | ||
| 54 | {{ if xserver == "y": }} | 54 | {{ if xserver == "y": }} |
| 55 | XSERVER ?= "${XSERVER_X86_BASE} \ | 55 | XSERVER ?= "${XSERVER_X86_BASE} \ |
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/kernel-list.noinstall b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/kernel-list.noinstall index 8903a823aa..811d695478 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/kernel-list.noinstall +++ b/scripts/lib/bsp/substrate/target/arch/i386/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/i386/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend deleted file mode 100644 index 35b0958582..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/i386/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/i386/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend deleted file mode 100644 index f04dd0cce4..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/i386/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/i386/recipes-kernel/linux/linux-yocto-tiny_3.17.bbappend b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend index fb4253271a..4de82fad00 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_3.17.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/i386/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" | 33 | #LINUX_VERSION = "3.19" |
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_3.10.bbappend b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_3.10.bbappend deleted file mode 100644 index 1cfc611949..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/i386/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:standard/common-pc" 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:standard/common-pc" 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/i386/recipes-kernel/linux/linux-yocto_3.17.bbappend b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_3.19.bbappend index c8fc73a97d..0c2cb5af62 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_3.17.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/i386/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 |
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 |
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/kernel-list.noinstall b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/kernel-list.noinstall index 8903a823aa..a04e6c7852 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/kernel-list.noinstall +++ b/scripts/lib/bsp/substrate/target/arch/mips64/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.14) 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.14"}} |
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend deleted file mode 100644 index 35b0958582..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/mips64/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/mips64/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend deleted file mode 100644 index f04dd0cce4..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/mips64/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/mips64/recipes-kernel/linux/linux-yocto-tiny_3.17.bbappend b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend index 142e38b3bc..a9ba0ae457 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_3.17.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/mips64/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/mips64/recipes-kernel/linux/linux-yocto_3.10.bbappend b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_3.10.bbappend deleted file mode 100644 index badb3aa239..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/mips64/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/mips64/recipes-kernel/linux/linux-yocto_3.14.bbappend b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_3.14.bbappend index 1e1cc51315..fb6cdef18b 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_3.14.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_3.14.bbappend | |||
| @@ -8,10 +8,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | |||
| 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" }} | 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 | 9 | ||
| 10 | {{ if need_new_kbranch == "y": }} | 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" }} | 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/edgerouter" }} |
| 12 | 12 | ||
| 13 | {{ if need_new_kbranch == "n": }} | 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" }} | 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/edgerouter" }} |
| 15 | 15 | ||
| 16 | {{ if need_new_kbranch == "n": }} | 16 | {{ if need_new_kbranch == "n": }} |
| 17 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | 17 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" |
| @@ -28,6 +28,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ | |||
| 28 | 28 | ||
| 29 | # uncomment and replace these SRCREVs with the real commit ids once you've had | 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 | 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}} ?= "dbe5b52e93ff114b2c0f5da6f6af91f52c18f2b8" |
| 32 | #SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993" | 32 | SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "6eddbf47875ef48ddc5864957a7b63363100782b" |
| 33 | #LINUX_VERSION = "3.14" \ No newline at end of file | 33 | #LINUX_VERSION = "3.14" \ No newline at end of file |
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_3.17.bbappend b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_3.19.bbappend index 2f1933055d..134aeecc51 100644 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_3.17.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/mips64/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" |
| @@ -8,10 +8,10 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | |||
| 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" }} | 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 | 9 | ||
| 10 | {{ if need_new_kbranch == "y": }} | 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" }} | 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/edgerouter" }} |
| 12 | 12 | ||
| 13 | {{ if need_new_kbranch == "n": }} | 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" }} | 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/edgerouter" }} |
| 15 | 15 | ||
| 16 | {{ if need_new_kbranch == "n": }} | 16 | {{ if need_new_kbranch == "n": }} |
| 17 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | 17 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" |
| @@ -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" | 33 | #LINUX_VERSION = "3.19" \ No newline at end of file |
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/machine.conf b/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/machine.conf index 48fcb2bbbe..c94f7f9e3f 100644 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/machine.conf +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/machine.conf | |||
| @@ -74,7 +74,7 @@ XSERVER ?= "xserver-xorg \ | |||
| 74 | xf86-input-evdev \ | 74 | xf86-input-evdev \ |
| 75 | xf86-video-fbdev" | 75 | xf86-video-fbdev" |
| 76 | 76 | ||
| 77 | PREFERRED_VERSION_u-boot ?= "v2013.07%" | 77 | PREFERRED_VERSION_u-boot ?= "v2015.01%" |
| 78 | {{ input type:"edit" name:"uboot_entrypoint" prio:"40" msg:"Please specify a value for UBOOT_ENTRYPOINT:" default:"0x00000000" }} | 78 | {{ input type:"edit" name:"uboot_entrypoint" prio:"40" msg:"Please specify a value for UBOOT_ENTRYPOINT:" default:"0x00000000" }} |
| 79 | UBOOT_ENTRYPOINT = "{{=uboot_entrypoint}}" | 79 | UBOOT_ENTRYPOINT = "{{=uboot_entrypoint}}" |
| 80 | 80 | ||
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 8903a823aa..811d695478 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.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/powerpc/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend deleted file mode 100644 index 39bc72d9c4..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/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" \ No newline at end of file | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend deleted file mode 100644 index f04dd0cce4..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/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/powerpc/recipes-kernel/linux/linux-yocto-tiny_3.17.bbappend b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_3.17.bbappend deleted file mode 100644 index fb4253271a..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_3.17.bbappend +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto-tiny_3.17": }} 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.17" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend new file mode 100644 index 0000000000..4de82fad00 --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto-tiny_3.19": }} 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.19" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_3.10.bbappend b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_3.10.bbappend deleted file mode 100644 index 15b4b973c9..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/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" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_3.17.bbappend b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_3.19.bbappend index 72af58afc1..ded9e85db5 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_3.17.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/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" |
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 8903a823aa..811d695478 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.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/qemu/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend deleted file mode 100644 index 3609787207..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend +++ /dev/null | |||
| @@ -1,62 +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 | {{ 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" nameappend:"arm" 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" nameappend:"arm" 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/qemuppc" }} | ||
| 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" and qemuarch == "mips64": }} | ||
| 40 | {{ input type:"choicelist" name:"new_kbranch" nameappend:"mips64" 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" }} | ||
| 41 | |||
| 42 | {{ if need_new_kbranch == "n" and qemuarch == "mips64": }} | ||
| 43 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips64" 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" }} | ||
| 44 | |||
| 45 | {{ if need_new_kbranch == "n": }} | ||
| 46 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | ||
| 47 | |||
| 48 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} | ||
| 49 | {{ if smp == "y": }} | ||
| 50 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | ||
| 51 | |||
| 52 | SRC_URI += "file://{{=machine}}-preempt-rt.scc \ | ||
| 53 | file://{{=machine}}-user-config.cfg \ | ||
| 54 | file://{{=machine}}-user-patches.scc \ | ||
| 55 | file://{{=machine}}-user-features.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}} ?= "f35992f80c81dc5fa1a97165dfd5cbb84661f7cb" | ||
| 61 | #SRCREV_meta_pn-linux-yocto-rt_{{=machine}} ?= "1b534b2f8bbe9b8a773268cfa30a4850346f6f5f" | ||
| 62 | #LINUX_VERSION = "3.10.35" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend deleted file mode 100644 index 1ee148fd0c..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend +++ /dev/null | |||
| @@ -1,62 +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 | {{ 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" nameappend:"arm" 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" }} | ||
| 11 | |||
| 12 | {{ if need_new_kbranch == "n" and qemuarch == "arm": }} | ||
| 13 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"arm" 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" }} | ||
| 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/tiny" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/tiny/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/tiny" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/tiny/base" }} | ||
| 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/tiny" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/tiny/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/tiny" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/tiny/common-pc" }} | ||
| 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/tiny" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/tiny/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/tiny" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/tiny/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/tiny" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/tiny/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/tiny" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/tiny/base" }} | ||
| 38 | |||
| 39 | {{ if need_new_kbranch == "y" and qemuarch == "mips64": }} | ||
| 40 | {{ input type:"choicelist" name:"new_kbranch" nameappend:"mips64" 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" }} | ||
| 41 | |||
| 42 | {{ if need_new_kbranch == "n" and qemuarch == "mips64": }} | ||
| 43 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips64" 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" }} | ||
| 44 | |||
| 45 | {{ if need_new_kbranch == "n": }} | ||
| 46 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | ||
| 47 | |||
| 48 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} | ||
| 49 | {{ if smp == "y": }} | ||
| 50 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | ||
| 51 | |||
| 52 | SRC_URI += "file://{{=machine}}-tiny.scc \ | ||
| 53 | file://{{=machine}}-user-config.cfg \ | ||
| 54 | file://{{=machine}}-user-patches.scc \ | ||
| 55 | file://{{=machine}}-user-features.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-tiny_{{=machine}} ?= "840bb8c059418c4753415df56c9aff1c0d5354c8" | ||
| 61 | #SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993" | ||
| 62 | #LINUX_VERSION = "3.10.35" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend index 5bfb877eb9..7879ce205c 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_3.4.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_3.14.bbappend | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto-tiny_3.4": }} this | 1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto-tiny_3.14": }} this |
| 2 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | 2 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" |
| 3 | 3 | ||
| 4 | PR := "${PR}.1" | 4 | PR := "${PR}.1" |
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_3.17.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend index 0175107899..f7ef4bb4a1 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_3.17.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/qemu/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" |
| @@ -59,4 +59,4 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ | |||
| 59 | # the appropriate changes committed to the upstream linux-yocto repo | 59 | # the appropriate changes committed to the upstream linux-yocto repo |
| 60 | #SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" | 60 | #SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" |
| 61 | #SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "8f55bee2403176a50cc0dd41811aa60fcf07243c" | 61 | #SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "8f55bee2403176a50cc0dd41811aa60fcf07243c" |
| 62 | #LINUX_VERSION = "3.17" | 62 | #LINUX_VERSION = "3.19" |
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_3.10.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_3.10.bbappend deleted file mode 100644 index 974e291afd..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ /dev/null | |||
| @@ -1,62 +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 | {{ 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" prio:"20" msg:"Please choose a machine branch to base your new BSP branch on:" default:"standard/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" prio:"20" msg:"Please choose an existing machine branch to use for this BSP:" default:"standard/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" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/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" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/qemuppc" }} | ||
| 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:standard/common-pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/common-pc" }} | ||
| 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:standard/common-pc" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/common-pc" }} | ||
| 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:standard/common-pc-64" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/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:standard/common-pc-64" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/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" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/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" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/mti-malta32" }} | ||
| 38 | |||
| 39 | {{ if need_new_kbranch == "y" and qemuarch == "mips64": }} | ||
| 40 | {{ input type:"choicelist" name:"new_kbranch" nameappend:"mips64" gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/base" }} | ||
| 41 | |||
| 42 | {{ if need_new_kbranch == "n" and qemuarch == "mips64": }} | ||
| 43 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips64" gen:"bsp.kernel.all_branches" branches_base:"standard" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/mti-malta64" }} | ||
| 44 | |||
| 45 | {{ if need_new_kbranch == "n": }} | ||
| 46 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | ||
| 47 | |||
| 48 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Would you like SMP support? (y/n)" default:"y"}} | ||
| 49 | {{ if smp == "y": }} | ||
| 50 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | ||
| 51 | |||
| 52 | SRC_URI += "file://{{=machine}}-standard.scc \ | ||
| 53 | file://{{=machine}}-user-config.cfg \ | ||
| 54 | file://{{=machine}}-user-patches.scc \ | ||
| 55 | file://{{=machine}}-user-features.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}} ?= "b170394a475b96ecc92cbc9e4b002bed0a9f69c5" | ||
| 61 | #SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "c2ed0f16fdec628242a682897d5d86df4547cf24" | ||
| 62 | #LINUX_VERSION = "3.10.35" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_3.17.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_3.19.bbappend index b81f272c38..b4798b7d69 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_3.17.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/qemu/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" |
| @@ -59,4 +59,4 @@ SRC_URI += "file://{{=machine}}-standard.scc \ | |||
| 59 | # the appropriate changes committed to the upstream linux-yocto repo | 59 | # the appropriate changes committed to the upstream linux-yocto repo |
| 60 | #SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" | 60 | #SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" |
| 61 | #SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "8f55bee2403176a50cc0dd41811aa60fcf07243c" | 61 | #SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "8f55bee2403176a50cc0dd41811aa60fcf07243c" |
| 62 | #LINUX_VERSION = "3.17" | 62 | #LINUX_VERSION = "3.19" |
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/kernel-list.noinstall b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/kernel-list.noinstall index 8903a823aa..811d695478 100644 --- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/kernel-list.noinstall +++ b/scripts/lib/bsp/substrate/target/arch/x86_64/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/x86_64/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend deleted file mode 100644 index 39bc72d9c4..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/x86_64/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" \ No newline at end of file | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend deleted file mode 100644 index f04dd0cce4..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/x86_64/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/x86_64/recipes-kernel/linux/linux-yocto-tiny_3.17.bbappend b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_3.17.bbappend deleted file mode 100644 index fb4253271a..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_3.17.bbappend +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto-tiny_3.17": }} 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.17" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend new file mode 100644 index 0000000000..4de82fad00 --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_3.19.bbappend | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto-tiny_3.19": }} 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.19" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_3.10.bbappend b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_3.10.bbappend deleted file mode 100644 index e21a333fa4..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/x86_64/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:standard/common-pc-64" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/common-pc-64/base" }} | ||
| 12 | |||
| 13 | {{ if need_new_kbranch == "n": }} | ||
| 14 | {{ input type:"choicelist" name:"existing_kbranch" 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" }} | ||
| 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}} ?= "b170394a475b96ecc92cbc9e4b002bed0a9f69c5" | ||
| 32 | #SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "c2ed0f16fdec628242a682897d5d86df4547cf24" | ||
| 33 | #LINUX_VERSION = "3.10.9" \ No newline at end of file | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_3.17.bbappend b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_3.19.bbappend index 08aa00a15c..dba63c3df5 100644 --- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_3.17.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/x86_64/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" | 33 | #LINUX_VERSION = "3.19" |