diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2012-12-12 22:56:32 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-13 16:54:32 +0000 |
commit | 254bf8c5d9135185c7f8cbb27496056be589b4ff (patch) | |
tree | dd1a7a463180722800d627d3e4a262c77b4443bb /scripts/lib/bsp/substrate/target/arch/i386 | |
parent | 4dc96e3629f3bb6e8478b95b9f4613a467c2f6bb (diff) | |
download | poky-254bf8c5d9135185c7f8cbb27496056be589b4ff.tar.gz |
yocto-bsp: update existing templates for linux-yocto-custom
Update existing templates to integrate with linux-yocto-custom.
(From meta-yocto rev: 7a8b55bdf499d001b77bb87345eb4eeab6013b2e)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/i386')
8 files changed, 15 insertions, 4 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 1da230629a..86d6a53331 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 | |||
@@ -3,8 +3,13 @@ | |||
3 | 3 | ||
4 | #@DESCRIPTION: Machine configuration for {{=machine}} systems | 4 | #@DESCRIPTION: Machine configuration for {{=machine}} systems |
5 | 5 | ||
6 | {{ preferred_kernel = kernel_choice.split('_')[0] }} | 6 | {{ if kernel_choice == "custom": preferred_kernel = "linux-yocto-custom" }} |
7 | {{ preferred_kernel_version = kernel_choice.split('_')[1] }} | 7 | {{ if kernel_choice == "custom": }} |
8 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" | ||
9 | |||
10 | {{ if kernel_choice != "custom": preferred_kernel = kernel_choice.split('_')[0] }} | ||
11 | {{ if kernel_choice != "custom": preferred_kernel_version = kernel_choice.split('_')[1] }} | ||
12 | {{ if kernel_choice != "custom": }} | ||
8 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" | 13 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" |
9 | PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" | 14 | PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" |
10 | 15 | ||
@@ -31,7 +36,12 @@ require conf/machine/include/meta-intel.inc | |||
31 | {{ input type:"choice" val:"xserver_emgd" msg:"EMGD xserver support (proprietary)" }} | 36 | {{ input type:"choice" val:"xserver_emgd" msg:"EMGD xserver support (proprietary)" }} |
32 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} | 37 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} |
33 | 38 | ||
34 | {{ if xserver == "y" and kernel_choice != "linux-yocto_3.4": xserver_choice = "xserver_i915" }} | 39 | {{ if xserver == "y" and kernel_choice == "custom": }} |
40 | {{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_i915" }} | ||
41 | {{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} | ||
42 | {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} | ||
43 | |||
44 | {{ if xserver == "y" and kernel_choice != "linux-yocto_3.4" and kernel_choice != "custom": xserver_choice = "xserver_i915" }} | ||
35 | 45 | ||
36 | {{ if xserver == "y": }} | 46 | {{ if xserver == "y": }} |
37 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 47 | XSERVER ?= "${XSERVER_IA32_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 13009cf3c2..e2b13ac5c7 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,4 +1,5 @@ | |||
1 | {{ if kernel_choice != "custom": }} | ||
1 | {{ input type:"boolean" name:"use_default_kernel" prio:"10" msg:"Would you like to use the default (3.4) kernel? (y/n)" default:"y"}} | 2 | {{ input type:"boolean" name:"use_default_kernel" prio:"10" msg:"Would you like to use the default (3.4) kernel? (y/n)" default:"y"}} |
2 | 3 | ||
3 | {{ if use_default_kernel == "n": }} | 4 | {{ if kernel_choice != "custom" and use_default_kernel == "n": }} |
4 | {{ 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.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_3.4"}} |
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/user-config.cfg b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-config.cfg index e69de29bb2..e69de29bb2 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/user-config.cfg +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-config.cfg | |||
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/user-patches.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-patches.scc index e69de29bb2..e69de29bb2 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/user-patches.scc +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/user-patches.scc | |||
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc index 2734d336bd..2734d336bd 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-preempt-rt.scc | |||
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc index e34882f93d..e34882f93d 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc | |||
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}.cfg b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.cfg index e93c0b8a08..e93c0b8a08 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}.cfg +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.cfg | |||
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc index d8d28cec7b..d8d28cec7b 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}.scc +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc | |||