From a88d6cb170345b7ed4101924e11dd36912deaa29 Mon Sep 17 00:00:00 2001 From: Leonardo Sandoval Date: Tue, 2 Feb 2016 10:50:51 +0000 Subject: 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 Signed-off-by: Richard Purdie (cherry picked from commit 9d585b5025187f059f75ffbdc01bda72d17e8a86) Signed-off-by: Leonardo Sandoval Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../arch/powerpc/recipes-kernel/linux/files/machine-preempt-rt.scc | 3 ++- .../arch/powerpc/recipes-kernel/linux/files/machine-standard.scc | 3 ++- .../target/arch/powerpc/recipes-kernel/linux/files/machine-tiny.scc | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel') 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 @@ # yocto-bsp-filename {{=machine}}-preempt-rt.scc define KMACHINE {{=machine}} -define KTYPE preempt-rt + define KARCH powerpc include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} {{ if need_new_kbranch == "y": }} +define KTYPE {{=new_kbranch}} branch {{=machine}} 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 @@ # yocto-bsp-filename {{=machine}}-standard.scc define KMACHINE {{=machine}} -define KTYPE standard + define KARCH powerpc include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} {{ if need_new_kbranch == "y": }} +define KTYPE {{=new_kbranch}} branch {{=machine}} 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 @@ # yocto-bsp-filename {{=machine}}-tiny.scc define KMACHINE {{=machine}} -define KTYPE tiny + define KARCH powerpc include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} {{ if need_new_kbranch == "y": }} +define KTYPE {{=new_kbranch}} branch {{=machine}} include {{=machine}}.scc -- cgit v1.2.3-54-g00ecf