From 04d15f567d0493654df519f404f564e2591e9453 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Mon, 4 Mar 2013 10:15:20 -0600 Subject: yocto-bsp: add support for linux-yocto-dev (From meta-yocto rev: 637104794a5646869d03ff5851d94199b1584dcf) Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- .../target/arch/arm/conf/machine/{{=machine}}.conf | 9 +++++---- ..."linux-yocto-dev\": }} linux-yocto-dev.bbappend" | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 "scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-dev\": }} linux-yocto-dev.bbappend" (limited to 'scripts/lib/bsp/substrate/target/arch/arm') diff --git a/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf index d9ac3ff602..ce9a58f38b 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf +++ b/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf @@ -71,12 +71,13 @@ EXTRA_IMAGECMD_jffs2 = "-lnp " SERIAL_CONSOLE = "115200 ttyO2" {{ if kernel_choice == "custom": preferred_kernel = "linux-yocto-custom" }} -{{ if kernel_choice == "custom": }} +{{ if kernel_choice == "linux-yocto-dev": preferred_kernel = "linux-yocto-dev" }} +{{ if kernel_choice == "custom" or kernel_choice == "linux-yocto-dev" : }} 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": }} +{{ if kernel_choice != "custom" and kernel_choice != "linux-yocto-dev": preferred_kernel = kernel_choice.split('_')[0] }} +{{ if kernel_choice != "custom" and kernel_choice != "linux-yocto-dev": preferred_kernel_version = kernel_choice.split('_')[1] }} +{{ if kernel_choice != "custom" and kernel_choice != "linux-yocto-dev": }} PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" diff --git "a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-dev\": }} linux-yocto-dev.bbappend" "b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-dev\": }} linux-yocto-dev.bbappend" new file mode 100644 index 0000000000..0d814469fb --- /dev/null +++ "b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice == \"linux-yocto-dev\": }} linux-yocto-dev.bbappend" @@ -0,0 +1,21 @@ +FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/files:" + +PR := "${PR}.1" + +COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" +{{ 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" }} + +{{ if need_new_kbranch == "y": }} +{{ 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" }} + +{{ if need_new_kbranch == "n": }} +{{ 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" }} + +{{ input type:"boolean" name:"smp" prio:"30" msg:"Would you like SMP support? (y/n)" default:"y"}} +{{ if smp == "y": }} +KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" + +SRC_URI += "file://{{=machine}}-standard.scc \ + file://{{=machine}}-user-config.cfg \ + file://{{=machine}}-user-patches.scc \ + " -- cgit v1.2.3-54-g00ecf