diff options
author | Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> | 2015-11-05 22:43:55 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-25 07:45:20 +0000 |
commit | 9d585b5025187f059f75ffbdc01bda72d17e8a86 (patch) | |
tree | 79863c608f202f5ad31b09c41f694cfca73f9b40 /scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files | |
parent | 1542c2ab72cd4bd7f429d4161b4c1e1a0a5841c6 (diff) | |
download | poky-9d585b5025187f059f75ffbdc01bda72d17e8a86.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)
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files')
3 files changed, 6 insertions, 3 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-preempt-rt.scc index 40c9267831..91ccfb8302 100644 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-preempt-rt.scc +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-preempt-rt.scc | |||
@@ -1,10 +1,11 @@ | |||
1 | # yocto-bsp-filename {{=machine}}-preempt-rt.scc | 1 | # yocto-bsp-filename {{=machine}}-preempt-rt.scc |
2 | define KMACHINE {{=machine}} | 2 | define KMACHINE {{=machine}} |
3 | define KTYPE preempt-rt | 3 | |
4 | define KARCH powerpc | 4 | define KARCH powerpc |
5 | 5 | ||
6 | include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} | 6 | include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} |
7 | {{ if need_new_kbranch == "y": }} | 7 | {{ if need_new_kbranch == "y": }} |
8 | define KTYPE {{=new_kbranch}} | ||
8 | branch {{=machine}} | 9 | branch {{=machine}} |
9 | 10 | ||
10 | include {{=machine}}.scc | 11 | include {{=machine}}.scc |
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-standard.scc b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-standard.scc index 7a1d35be1e..89b344feab 100644 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-standard.scc | |||
@@ -1,10 +1,11 @@ | |||
1 | # yocto-bsp-filename {{=machine}}-standard.scc | 1 | # yocto-bsp-filename {{=machine}}-standard.scc |
2 | define KMACHINE {{=machine}} | 2 | define KMACHINE {{=machine}} |
3 | define KTYPE standard | 3 | |
4 | define KARCH powerpc | 4 | define KARCH powerpc |
5 | 5 | ||
6 | include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} | 6 | include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} |
7 | {{ if need_new_kbranch == "y": }} | 7 | {{ if need_new_kbranch == "y": }} |
8 | define KTYPE {{=new_kbranch}} | ||
8 | branch {{=machine}} | 9 | branch {{=machine}} |
9 | 10 | ||
10 | include {{=machine}}.scc | 11 | include {{=machine}}.scc |
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-tiny.scc b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-tiny.scc index 1bf94b2d05..2701fd8b50 100644 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-tiny.scc +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-tiny.scc | |||
@@ -1,10 +1,11 @@ | |||
1 | # yocto-bsp-filename {{=machine}}-tiny.scc | 1 | # yocto-bsp-filename {{=machine}}-tiny.scc |
2 | define KMACHINE {{=machine}} | 2 | define KMACHINE {{=machine}} |
3 | define KTYPE tiny | 3 | |
4 | define KARCH powerpc | 4 | define KARCH powerpc |
5 | 5 | ||
6 | include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} | 6 | include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} |
7 | {{ if need_new_kbranch == "y": }} | 7 | {{ if need_new_kbranch == "y": }} |
8 | define KTYPE {{=new_kbranch}} | ||
8 | branch {{=machine}} | 9 | branch {{=machine}} |
9 | 10 | ||
10 | include {{=machine}}.scc | 11 | include {{=machine}}.scc |