From 9d585b5025187f059f75ffbdc01bda72d17e8a86 Mon Sep 17 00:00:00 2001 From: Leonardo Sandoval Date: Thu, 5 Nov 2015 22:43:55 +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) Signed-off-by: Leonardo Sandoval Signed-off-by: Richard Purdie --- .../target/arch/mips/recipes-kernel/linux/files/machine-preempt-rt.scc | 3 ++- .../target/arch/mips/recipes-kernel/linux/files/machine-standard.scc | 3 ++- .../target/arch/mips/recipes-kernel/linux/files/machine-tiny.scc | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'scripts/lib/bsp/substrate/target/arch/mips') diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-preempt-rt.scc index 176190cd2e..a128255b38 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-preempt-rt.scc +++ b/scripts/lib/bsp/substrate/target/arch/mips/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 mips 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/mips/recipes-kernel/linux/files/machine-standard.scc b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-standard.scc index f05dd851d2..7c9dc52d22 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/mips/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 mips 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/mips/recipes-kernel/linux/files/machine-tiny.scc b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-tiny.scc index f71c775397..64f395bbc4 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-tiny.scc +++ b/scripts/lib/bsp/substrate/target/arch/mips/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 mips 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