From 254bf8c5d9135185c7f8cbb27496056be589b4ff Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Wed, 12 Dec 2012 22:56:32 -0600 Subject: 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 Signed-off-by: Richard Purdie --- .../target/arch/i386/conf/machine/{{=machine}}.conf | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf') 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 @@ #@DESCRIPTION: Machine configuration for {{=machine}} systems -{{ preferred_kernel = kernel_choice.split('_')[0] }} -{{ preferred_kernel_version = kernel_choice.split('_')[1] }} +{{ if kernel_choice == "custom": preferred_kernel = "linux-yocto-custom" }} +{{ if kernel_choice == "custom": }} +PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" + +{{ if kernel_choice != "custom": preferred_kernel = kernel_choice.split('_')[0] }} +{{ if kernel_choice != "custom": preferred_kernel_version = kernel_choice.split('_')[1] }} +{{ if kernel_choice != "custom": }} PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" @@ -31,7 +36,12 @@ require conf/machine/include/meta-intel.inc {{ input type:"choice" val:"xserver_emgd" msg:"EMGD xserver support (proprietary)" }} {{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} -{{ if xserver == "y" and kernel_choice != "linux-yocto_3.4": xserver_choice = "xserver_i915" }} +{{ if xserver == "y" and kernel_choice == "custom": }} +{{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_i915" }} +{{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} +{{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} + +{{ if xserver == "y" and kernel_choice != "linux-yocto_3.4" and kernel_choice != "custom": xserver_choice = "xserver_i915" }} {{ if xserver == "y": }} XSERVER ?= "${XSERVER_IA32_BASE} \ -- cgit v1.2.3-54-g00ecf