diff options
author | Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> | 2016-10-04 16:53:34 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-05 10:10:11 +0100 |
commit | 338c77549957bee736c29e54a3451f922b6e33f1 (patch) | |
tree | 050824c11ebed2923a4fbedd543b707edf412c7f /scripts | |
parent | fc34ac070a312e5d663b8f6fe19641e4cd379704 (diff) | |
download | poky-338c77549957bee736c29e54a3451f922b6e33f1.tar.gz |
yocto-bsp: linux-yocto recipes update (4.4 to 4.8) for qemu arch
[YOCTO #10301]
(From meta-yocto rev: b0e3518ffae3e72d7aad20860b3da79b70d74383)
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
3 files changed, 125 insertions, 2 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/kernel-list.noinstall b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/kernel-list.noinstall index 00cf360426..0120ed055e 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.4) kernel? (y/n)" default:"y"}} | 2 | {{ input type:"boolean" name:"use_default_kernel" prio:"10" msg:"Would you like to use the default (4.8) kernel? (y/n)" default:"y"}} |
3 | 3 | ||
4 | {{ if kernel_choice != "custom" and use_default_kernel == "n": }} | 4 | {{ if kernel_choice != "custom" and use_default_kernel == "n": }} |
5 | {{ input type:"choicelist" name:"kernel_choice" gen:"bsp.kernel.kernels" prio:"10" msg:"Please choose the kernel to use in this BSP:" default:"linux-yocto_4.4"}} | 5 | {{ input type:"choicelist" name:"kernel_choice" gen:"bsp.kernel.kernels" prio:"10" msg:"Please choose the kernel to use in this BSP:" default:"linux-yocto_4.8"}} |
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend new file mode 100644 index 0000000000..c1635d6f6b --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend | |||
@@ -0,0 +1,62 @@ | |||
1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto-tiny_4.8": }} 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.8" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.8.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.8.bbappend new file mode 100644 index 0000000000..e8c3fc82e4 --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.8.bbappend | |||
@@ -0,0 +1,61 @@ | |||
1 | # yocto-bsp-filename {{ if kernel_choice == "linux-yocto_4.8": }} 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" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/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" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/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" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/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" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/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.8" | ||