summaryrefslogtreecommitdiffstats
path: root/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-standard.scc
diff options
context:
space:
mode:
authorLeonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>2016-02-02 10:50:51 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-04 23:20:18 +0000
commita88d6cb170345b7ed4101924e11dd36912deaa29 (patch)
tree6284c38f4ef2a95f852f9257a4f8b2aa62353d4c /scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-standard.scc
parent4e74b36458b36ee1202689388da5423ed9ee7b71 (diff)
downloadpoky-a88d6cb170345b7ed4101924e11dd36912deaa29.tar.gz
yocto-bsp: Set KTYPE to user selected base branch
Fixes the hardcode branch name set to KTYPE, where its value is used as a base branch when user decides to create a new branch. Tested on x86_64 architecture. [YOCTO #8630] (From meta-yocto rev: ab895be90a0cae7dfa77a8aab3b19e5571e7e7bc) (From meta-yocto rev: bc5aec2348b2c314953806734a8fbabf798d142c) Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 9d585b5025187f059f75ffbdc01bda72d17e8a86) Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-standard.scc')
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-standard.scc3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-standard.scc b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-standard.scc
index d2a03ec209..14554da285 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-standard.scc
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-standard.scc
@@ -1,6 +1,6 @@
1# yocto-bsp-filename {{=machine}}-standard.scc 1# yocto-bsp-filename {{=machine}}-standard.scc
2define KMACHINE {{=machine}} 2define KMACHINE {{=machine}}
3define KTYPE standard 3
4define KARCH {{=qemuarch}} 4define KARCH {{=qemuarch}}
5 5
6{{ if qemuarch == "i386" or qemuarch == "x86_64": }} 6{{ if qemuarch == "i386" or qemuarch == "x86_64": }}
@@ -14,6 +14,7 @@ include bsp/mti-malta32/mti-malta32-be-standard
14{{ if qemuarch == "mips64": }} 14{{ if qemuarch == "mips64": }}
15include bsp/mti-malta64/mti-malta64-be-standard 15include bsp/mti-malta64/mti-malta64-be-standard
16{{ if need_new_kbranch == "y": }} 16{{ if need_new_kbranch == "y": }}
17define KTYPE {{=new_kbranch}}
17branch {{=machine}} 18branch {{=machine}}
18 19
19include {{=machine}}.scc 20include {{=machine}}.scc