diff options
author | Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> | 2016-10-04 16:53:37 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-05 10:10:11 +0100 |
commit | fc34ac070a312e5d663b8f6fe19641e4cd379704 (patch) | |
tree | b186a4750405e52bd032bee31560e9e707a5472b /scripts/lib/bsp/substrate | |
parent | f43da797b9b8be50264aaef7e29d280bafac02d6 (diff) | |
download | poky-fc34ac070a312e5d663b8f6fe19641e4cd379704.tar.gz |
yocto-bsp: linux-yocto recipes update (4.4 to 4.8) for i386 arch
[YOCTO #10301]
(From meta-yocto rev: 0b58b90844c2898c604e7310c3fa5577044c0f08)
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/bsp/substrate')
4 files changed, 68 insertions, 3 deletions
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 a95562797a..4745c1cc56 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 | |||
@@ -41,7 +41,7 @@ MACHINE_FEATURES += "wifi efi pcbios" | |||
41 | {{ input type:"choice" val:"xserver_fbdev" msg:"fbdev xserver support" }} | 41 | {{ input type:"choice" val:"xserver_fbdev" msg:"fbdev xserver support" }} |
42 | {{ input type:"choice" val:"xserver_modesetting" msg:"modesetting xserver support" }} | 42 | {{ input type:"choice" val:"xserver_modesetting" msg:"modesetting xserver support" }} |
43 | 43 | ||
44 | {{ 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" }} | 44 | {{ if xserver == "y" and kernel_choice != "linux-yocto_4.8" and kernel_choice != "linux-yocto_4.4" and kernel_choice != "linux-yocto_4.1" and kernel_choice != "custom": xserver_choice = "xserver_i915" }} |
45 | 45 | ||
46 | {{ if xserver == "y": }} | 46 | {{ if xserver == "y": }} |
47 | XSERVER ?= "${XSERVER_X86_BASE} \ | 47 | 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 00cf360426..0120ed055e 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.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/i386/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend new file mode 100644 index 0000000000..5fb45d9ab7 --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend | |||
@@ -0,0 +1,33 @@ | |||
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 | |||
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.8" | ||
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_4.8.bbappend b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_4.8.bbappend new file mode 100644 index 0000000000..137d8fa519 --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/linux-yocto_4.8.bbappend | |||
@@ -0,0 +1,32 @@ | |||
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 | |||
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" 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" 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.8" | ||