diff options
| author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2013-04-04 08:47:21 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-05 22:54:30 +0100 |
| commit | 6eeb94247049c6697da8e9339280bc4efe14db72 (patch) | |
| tree | 6b7f992ffdd7172e35f28e9a0b1d27995b2e1dc4 | |
| parent | 7bff0d6803c9958238e01d9dfb706ae84e4e6cef (diff) | |
| download | poky-6eeb94247049c6697da8e9339280bc4efe14db72.tar.gz | |
yocto-bsp: change qemu-based mips BSP default branch
The default branch for the qemu-based mips BSP template no longer
exists, so change to one that does.
(From meta-yocto rev: 5af614322269ee7c79928d1ff343f2e3bcf35509)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3 files changed, 3 insertions, 3 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 a7df3e3ebf..68e6b08789 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 | |||
| @@ -33,7 +33,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | |||
| 33 | {{ input type:"choicelist" name:"new_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/base" }} | 33 | {{ input type:"choicelist" name:"new_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/base" }} |
| 34 | 34 | ||
| 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" }} |
| 37 | 37 | ||
| 38 | {{ if need_new_kbranch == "n": }} | 38 | {{ if need_new_kbranch == "n": }} |
| 39 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | 39 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" |
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 1b9cce3226..aae25ab460 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 | |||
| @@ -33,7 +33,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | |||
| 33 | {{ input type:"choicelist" name:"new_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/base" }} | 33 | {{ input type:"choicelist" name:"new_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/base" }} |
| 34 | 34 | ||
| 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" }} |
| 37 | 37 | ||
| 38 | {{ if need_new_kbranch == "n": }} | 38 | {{ if need_new_kbranch == "n": }} |
| 39 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | 39 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" |
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 572efe657e..af56d735a0 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 | |||
| @@ -33,7 +33,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}" | |||
| 33 | {{ input type:"choicelist" name:"new_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/base" }} | 33 | {{ input type:"choicelist" name:"new_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/base" }} |
| 34 | 34 | ||
| 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" }} |
| 37 | 37 | ||
| 38 | {{ if need_new_kbranch == "n": }} | 38 | {{ if need_new_kbranch == "n": }} |
| 39 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" | 39 | KBRANCH_{{=machine}} = "{{=existing_kbranch}}" |