diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2013-03-22 23:43:35 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-05 22:54:29 +0100 |
commit | fd7077260b1675b21228903cc8b616254926eadf (patch) | |
tree | 915a01bc843edd99ddac9cb7eab01779f503f2c3 /scripts/lib/bsp/substrate/target/arch/qemu | |
parent | 03b5c841618f14445ff720e542da02f92490dece (diff) | |
download | poky-fd7077260b1675b21228903cc8b616254926eadf.tar.gz |
yocto-bsp: add KBRANCH for existing kbranch cases
For the cases where a BSP reuses an existing branch, we still need the
KBRANCH in order to be able to specify an existing branch.
(From meta-yocto rev: 5a3167c4fa6cb53ec501e9de185b93748973ec18)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/qemu')
5 files changed, 15 insertions, 0 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-dev": }} linux-yocto-dev.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-dev": }} linux-yocto-dev.bbappend index bcf4fd8178..a7df3e3ebf 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-dev": }} linux-yocto-dev.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-dev": }} linux-yocto-dev.bbappend | |||
@@ -35,6 +35,9 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | |||
35 | {{ if need_new_kbranch == "n" and qemuarch == "mips": }} | 35 | {{ if need_new_kbranch == "n" and qemuarch == "mips": }} |
36 | {{ 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-be" }} | 36 | {{ 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-be" }} |
37 | 37 | ||
38 | {{ if need_new_kbranch == "n": }} | ||
39 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | ||
40 | |||
38 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Would you like SMP support? (y/n)" default:"y"}} | 41 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Would you like SMP support? (y/n)" default:"y"}} |
39 | {{ if smp == "y": }} | 42 | {{ if smp == "y": }} |
40 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | 43 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" |
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend index 8dad75a6d8..f29240ba86 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-rt_3.4": }} linux-yocto-rt_3.4.bbappend | |||
@@ -35,6 +35,9 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | |||
35 | {{ if need_new_kbranch == "n" and qemuarch == "mips": }} | 35 | {{ if need_new_kbranch == "n" and qemuarch == "mips": }} |
36 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} | 36 | {{ input type:"choicelist" name:"existing_kbranch" nameappend:"mips" gen:"bsp.kernel.all_branches" branches_base:"standard/preempt-rt" prio:"20" msg:"Please choose a machine branch to base this BSP on:" default:"standard/preempt-rt/base" }} |
37 | 37 | ||
38 | {{ if need_new_kbranch == "n": }} | ||
39 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | ||
40 | |||
38 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} | 41 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} |
39 | {{ if smp == "y": }} | 42 | {{ if smp == "y": }} |
40 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | 43 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" |
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-tiny_3.4": }} linux-yocto-tiny_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-tiny_3.4": }} linux-yocto-tiny_3.4.bbappend index b980f7f14e..ff53b535ed 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-tiny_3.4": }} linux-yocto-tiny_3.4.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto-tiny_3.4": }} linux-yocto-tiny_3.4.bbappend | |||
@@ -35,6 +35,9 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | |||
35 | {{ if need_new_kbranch == "n" and qemuarch == "mips": }} | 35 | {{ if need_new_kbranch == "n" and qemuarch == "mips": }} |
36 | {{ 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" }} | 36 | {{ 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" }} |
37 | 37 | ||
38 | {{ if need_new_kbranch == "n": }} | ||
39 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | ||
40 | |||
38 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} | 41 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} |
39 | {{ if smp == "y": }} | 42 | {{ if smp == "y": }} |
40 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | 43 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" |
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend index 9385059504..1b9cce3226 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.4": }} linux-yocto_3.4.bbappend | |||
@@ -35,6 +35,9 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | |||
35 | {{ if need_new_kbranch == "n" and qemuarch == "mips": }} | 35 | {{ if need_new_kbranch == "n" and qemuarch == "mips": }} |
36 | {{ 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-be" }} | 36 | {{ 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-be" }} |
37 | 37 | ||
38 | {{ if need_new_kbranch == "n": }} | ||
39 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | ||
40 | |||
38 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Would you like SMP support? (y/n)" default:"y"}} | 41 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Would you like SMP support? (y/n)" default:"y"}} |
39 | {{ if smp == "y": }} | 42 | {{ if smp == "y": }} |
40 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | 43 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" |
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.8": }} linux-yocto_3.8.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.8": }} linux-yocto_3.8.bbappend index b0137ca37f..e2013ea1f2 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.8": }} linux-yocto_3.8.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice == "linux-yocto_3.8": }} linux-yocto_3.8.bbappend | |||
@@ -35,6 +35,9 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | |||
35 | {{ if need_new_kbranch == "n" and qemuarch == "mips": }} | 35 | {{ if need_new_kbranch == "n" and qemuarch == "mips": }} |
36 | {{ 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-be" }} | 36 | {{ 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-be" }} |
37 | 37 | ||
38 | {{ if need_new_kbranch == "n": }} | ||
39 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | ||
40 | |||
38 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Would you like SMP support? (y/n)" default:"y"}} | 41 | {{ input type:"boolean" name:"smp" prio:"30" msg:"Would you like SMP support? (y/n)" default:"y"}} |
39 | {{ if smp == "y": }} | 42 | {{ if smp == "y": }} |
40 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" | 43 | KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" |