diff options
23 files changed, 530 insertions, 17 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 7676ca8839..00cf360426 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 (4.1) kernel? (y/n)" default:"y"}} | 2 | {{ input type:"boolean" name:"use_default_kernel" prio:"10" msg:"Would you like to use the default (4.4) 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_4.1"}} | 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_4.4"}} |
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend new file mode 100644 index 0000000000..815c77b813 --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend | |||
@@ -0,0 +1,33 @@ | |||
1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto-tiny_4.4": }} 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 | # 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}} ?= "${AUTOREV}" | ||
32 | SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" | ||
33 | #LINUX_VERSION = "4.4" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.4.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.4.bbappend new file mode 100644 index 0000000000..b88a06c52a --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.4.bbappend | |||
@@ -0,0 +1,32 @@ | |||
1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto_4.4": }} 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-features.scc \ | ||
26 | " | ||
27 | |||
28 | # replace these SRCREVs with the real commit ids once you've had | ||
29 | # the appropriate changes committed to the upstream linux-yocto repo | ||
30 | SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" | ||
31 | SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" | ||
32 | #LINUX_VERSION = "4.4" | ||
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 1739ab3cfe..d5abe4f613 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_4.1" or kernel_choice == "linux-yocto_3.19" or kernel_choice == "linux-yocto_3.14"): }} | 36 | {{ if xserver == "y" and (kernel_choice == "linux-yocto_4.4" or kernel_choice == "linux-yocto_4.1"): }} |
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_4.1" and kernel_choice != "linux-yocto_3.19" and kernel_choice != "linux-yocto_3.14" and kernel_choice != "custom": xserver_choice = "xserver_i915" }} | 52 | {{ if xserver == "y" and kernel_choice != "linux-yocto_4.4" and kernel_choice != "linux-yocto_4.1" 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 7676ca8839..00cf360426 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 (4.1) kernel? (y/n)" default:"y"}} | 2 | {{ input type:"boolean" name:"use_default_kernel" prio:"10" msg:"Would you like to use the default (4.4) 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_4.1"}} | 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_4.4"}} |
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend new file mode 100644 index 0000000000..815c77b813 --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend | |||
@@ -0,0 +1,33 @@ | |||
1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto-tiny_4.4": }} 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 | # 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}} ?= "${AUTOREV}" | ||
32 | SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" | ||
33 | #LINUX_VERSION = "4.4" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_4.4.bbappend b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_4.4.bbappend new file mode 100644 index 0000000000..e541c6aa97 --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_4.4.bbappend | |||
@@ -0,0 +1,32 @@ | |||
1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto_4.4": }} 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-features.scc \ | ||
26 | " | ||
27 | |||
28 | # replace these SRCREVs with the real commit ids once you've had | ||
29 | # the appropriate changes committed to the upstream linux-yocto repo | ||
30 | SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" | ||
31 | SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" | ||
32 | #LINUX_VERSION = "4.4" | ||
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 7676ca8839..00cf360426 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 (4.1) kernel? (y/n)" default:"y"}} | 2 | {{ input type:"boolean" name:"use_default_kernel" prio:"10" msg:"Would you like to use the default (4.4) 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_4.1"}} | 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_4.4"}} |
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend new file mode 100644 index 0000000000..815c77b813 --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend | |||
@@ -0,0 +1,33 @@ | |||
1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto-tiny_4.4": }} 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 | # 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}} ?= "${AUTOREV}" | ||
32 | SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" | ||
33 | #LINUX_VERSION = "4.4" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.4.bbappend b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.4.bbappend new file mode 100644 index 0000000000..b88a06c52a --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/linux-yocto_4.4.bbappend | |||
@@ -0,0 +1,32 @@ | |||
1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto_4.4": }} 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-features.scc \ | ||
26 | " | ||
27 | |||
28 | # replace these SRCREVs with the real commit ids once you've had | ||
29 | # the appropriate changes committed to the upstream linux-yocto repo | ||
30 | SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" | ||
31 | SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" | ||
32 | #LINUX_VERSION = "4.4" | ||
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 7676ca8839..00cf360426 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 (4.1) kernel? (y/n)" default:"y"}} | 2 | {{ input type:"boolean" name:"use_default_kernel" prio:"10" msg:"Would you like to use the default (4.4) 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_4.1"}} | 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_4.4"}} |
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend new file mode 100644 index 0000000000..815c77b813 --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend | |||
@@ -0,0 +1,33 @@ | |||
1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto-tiny_4.4": }} 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 | # 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}} ?= "${AUTOREV}" | ||
32 | SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" | ||
33 | #LINUX_VERSION = "4.4" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_4.4.bbappend b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_4.4.bbappend new file mode 100644 index 0000000000..57c90fa3ab --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/linux-yocto_4.4.bbappend | |||
@@ -0,0 +1,32 @@ | |||
1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto_4.4": }} 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/edgerouter" }} | ||
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/edgerouter" }} | ||
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-features.scc \ | ||
26 | " | ||
27 | |||
28 | # replace these SRCREVs with the real commit ids once you've had | ||
29 | # the appropriate changes committed to the upstream linux-yocto repo | ||
30 | SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" | ||
31 | SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" | ||
32 | #LINUX_VERSION = "4.4" | ||
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 018146fc0c..583c5e44fd 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 ?= "v2015.07%" | 77 | PREFERRED_VERSION_u-boot ?= "v2016.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 7676ca8839..00cf360426 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 (4.1) kernel? (y/n)" default:"y"}} | 2 | {{ input type:"boolean" name:"use_default_kernel" prio:"10" msg:"Would you like to use the default (4.4) 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_4.1"}} | 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_4.4"}} |
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend new file mode 100644 index 0000000000..815c77b813 --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend | |||
@@ -0,0 +1,33 @@ | |||
1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto-tiny_4.4": }} 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 | # 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}} ?= "${AUTOREV}" | ||
32 | SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" | ||
33 | #LINUX_VERSION = "4.4" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.4.bbappend b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.4.bbappend new file mode 100644 index 0000000000..b88a06c52a --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/linux-yocto_4.4.bbappend | |||
@@ -0,0 +1,32 @@ | |||
1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto_4.4": }} 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-features.scc \ | ||
26 | " | ||
27 | |||
28 | # replace these SRCREVs with the real commit ids once you've had | ||
29 | # the appropriate changes committed to the upstream linux-yocto repo | ||
30 | SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" | ||
31 | SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" | ||
32 | #LINUX_VERSION = "4.4" | ||
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 7676ca8839..00cf360426 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 (4.1) kernel? (y/n)" default:"y"}} | 2 | {{ input type:"boolean" name:"use_default_kernel" prio:"10" msg:"Would you like to use the default (4.4) 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_4.1"}} | 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_4.4"}} |
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend new file mode 100644 index 0000000000..e256e08bd1 --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend | |||
@@ -0,0 +1,62 @@ | |||
1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto-tiny_4.4": }} 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 | # 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}} ?= "${AUTOREV}" | ||
61 | SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" | ||
62 | #LINUX_VERSION = "4.4" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.4.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.4.bbappend new file mode 100644 index 0000000000..7be0fe9173 --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.4.bbappend | |||
@@ -0,0 +1,61 @@ | |||
1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto_4.4": }} 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 == "n" and qemuarch == "mips": }} | ||
34 | {{ 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" }} | ||
35 | |||
36 | {{ if need_new_kbranch == "n" and qemuarch == "mips64": }} | ||
37 | {{ 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" }} | ||
38 | |||
39 | {{ if need_new_kbranch == "y" and qemuarch == "mips": }} | ||
40 | {{ 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" }} | ||
41 | |||
42 | {{ if need_new_kbranch == "y" and qemuarch == "mips64": }} | ||
43 | {{ 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" }} | ||
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-features.scc \ | ||
55 | " | ||
56 | |||
57 | # replace these SRCREVs with the real commit ids once you've had | ||
58 | # the appropriate changes committed to the upstream linux-yocto repo | ||
59 | SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" | ||
60 | SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" | ||
61 | #LINUX_VERSION = "4.4" | ||
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 dbbe9342fe..00cf360426 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 (4.1) kernel? (y/n)" default:"y"}} | 2 | {{ input type:"boolean" name:"use_default_kernel" prio:"10" msg:"Would you like to use the default (4.4) 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.19"}} | 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_4.4"}} |
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend new file mode 100644 index 0000000000..815c77b813 --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend | |||
@@ -0,0 +1,33 @@ | |||
1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto-tiny_4.4": }} 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 | # 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}} ?= "${AUTOREV}" | ||
32 | SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" | ||
33 | #LINUX_VERSION = "4.4" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_4.4.bbappend b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_4.4.bbappend new file mode 100644 index 0000000000..41b37598c2 --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/linux-yocto_4.4.bbappend | |||
@@ -0,0 +1,32 @@ | |||
1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto_4.4": }} 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-features.scc \ | ||
26 | " | ||
27 | |||
28 | # replace these SRCREVs with the real commit ids once you've had | ||
29 | # the appropriate changes committed to the upstream linux-yocto repo | ||
30 | SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" | ||
31 | SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" | ||
32 | #LINUX_VERSION = "4.4" | ||