summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLeonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>2015-11-05 22:43:55 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-25 07:45:20 (GMT)
commit9d585b5025187f059f75ffbdc01bda72d17e8a86 (patch)
tree79863c608f202f5ad31b09c41f694cfca73f9b40 /scripts
parent1542c2ab72cd4bd7f429d4161b4c1e1a0a5841c6 (diff)
downloadpoky-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')
-rw-r--r--scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-preempt-rt.scc3
-rw-r--r--scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-standard.scc3
-rw-r--r--scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-tiny.scc3
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-preempt-rt.scc3
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-standard.scc3
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-tiny.scc3
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-preempt-rt.scc3
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-standard.scc3
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine-tiny.scc3
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-preempt-rt.scc3
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-standard.scc3
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-tiny.scc3
-rw-r--r--scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-preempt-rt.scc3
-rw-r--r--scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-standard.scc3
-rw-r--r--scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine-tiny.scc3
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-preempt-rt.scc3
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-standard.scc3
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-tiny.scc3
-rw-r--r--scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-preempt-rt.scc3
-rw-r--r--scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-standard.scc3
-rw-r--r--scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-tiny.scc3
21 files changed, 42 insertions, 21 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-preempt-rt.scc
index ca5f3b5..ea6966c 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-preempt-rt.scc
+++ b/scripts/lib/bsp/substrate/target/arch/arm/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
2define KMACHINE {{=machine}} 2define KMACHINE {{=machine}}
3define KTYPE preempt-rt 3
4define KARCH arm 4define KARCH arm
5 5
6include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 6include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
7{{ if need_new_kbranch == "y": }} 7{{ if need_new_kbranch == "y": }}
8define KTYPE {{=new_kbranch}}
8branch {{=machine}} 9branch {{=machine}}
9 10
10include {{=machine}}.scc 11include {{=machine}}.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-standard.scc b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-standard.scc
index 9014c2c..405972d 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-standard.scc
+++ b/scripts/lib/bsp/substrate/target/arch/arm/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
2define KMACHINE {{=machine}} 2define KMACHINE {{=machine}}
3define KTYPE standard 3
4define KARCH arm 4define KARCH arm
5 5
6include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 6include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
7{{ if need_new_kbranch == "y": }} 7{{ if need_new_kbranch == "y": }}
8define KTYPE {{=new_kbranch}}
8branch {{=machine}} 9branch {{=machine}}
9 10
10include {{=machine}}.scc 11include {{=machine}}.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-tiny.scc b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-tiny.scc
index 3f1c252..921b7e7 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine-tiny.scc
+++ b/scripts/lib/bsp/substrate/target/arch/arm/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
2define KMACHINE {{=machine}} 2define KMACHINE {{=machine}}
3define KTYPE tiny 3
4define KARCH arm 4define KARCH arm
5 5
6include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 6include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
7{{ if need_new_kbranch == "y": }} 7{{ if need_new_kbranch == "y": }}
8define KTYPE {{=new_kbranch}}
8branch {{=machine}} 9branch {{=machine}}
9 10
10include {{=machine}}.scc 11include {{=machine}}.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-preempt-rt.scc
index 619ee3f..7146e23 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-preempt-rt.scc
+++ b/scripts/lib/bsp/substrate/target/arch/i386/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
2define KMACHINE {{=machine}} 2define KMACHINE {{=machine}}
3define KTYPE preempt-rt 3
4define KARCH i386 4define KARCH i386
5 5
6include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 6include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
7{{ if need_new_kbranch == "y": }} 7{{ if need_new_kbranch == "y": }}
8define KTYPE {{=new_kbranch}}
8branch {{=machine}} 9branch {{=machine}}
9 10
10include {{=machine}}.scc 11include {{=machine}}.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-standard.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-standard.scc
index 682012f..67a54be 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-standard.scc
+++ b/scripts/lib/bsp/substrate/target/arch/i386/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
2define KMACHINE {{=machine}} 2define KMACHINE {{=machine}}
3define KTYPE standard 3
4define KARCH i386 4define KARCH i386
5 5
6include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 6include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
7{{ if need_new_kbranch == "y": }} 7{{ if need_new_kbranch == "y": }}
8define KTYPE {{=new_kbranch}}
8branch {{=machine}} 9branch {{=machine}}
9 10
10include {{=machine}}.scc 11include {{=machine}}.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-tiny.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-tiny.scc
index cc75196..91373b3 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine-tiny.scc
+++ b/scripts/lib/bsp/substrate/target/arch/i386/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
2define KMACHINE {{=machine}} 2define KMACHINE {{=machine}}
3define KTYPE tiny 3
4define KARCH i386 4define KARCH i386
5 5
6include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 6include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
7{{ if need_new_kbranch == "y": }} 7{{ if need_new_kbranch == "y": }}
8define KTYPE {{=new_kbranch}}
8branch {{=machine}} 9branch {{=machine}}
9 10
10include {{=machine}}.scc 11include {{=machine}}.scc
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 176190c..a128255 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 @@
1# yocto-bsp-filename {{=machine}}-preempt-rt.scc 1# yocto-bsp-filename {{=machine}}-preempt-rt.scc
2define KMACHINE {{=machine}} 2define KMACHINE {{=machine}}
3define KTYPE preempt-rt 3
4define KARCH mips 4define KARCH mips
5 5
6include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 6include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
7{{ if need_new_kbranch == "y": }} 7{{ if need_new_kbranch == "y": }}
8define KTYPE {{=new_kbranch}}
8branch {{=machine}} 9branch {{=machine}}
9 10
10include {{=machine}}.scc 11include {{=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 f05dd85..7c9dc52 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 @@
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 mips 4define KARCH mips
5 5
6include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 6include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
7{{ if need_new_kbranch == "y": }} 7{{ if need_new_kbranch == "y": }}
8define KTYPE {{=new_kbranch}}
8branch {{=machine}} 9branch {{=machine}}
9 10
10include {{=machine}}.scc 11include {{=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 f71c775..64f395b 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 @@
1# yocto-bsp-filename {{=machine}}-tiny.scc 1# yocto-bsp-filename {{=machine}}-tiny.scc
2define KMACHINE {{=machine}} 2define KMACHINE {{=machine}}
3define KTYPE tiny 3
4define KARCH mips 4define KARCH mips
5 5
6include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 6include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
7{{ if need_new_kbranch == "y": }} 7{{ if need_new_kbranch == "y": }}
8define KTYPE {{=new_kbranch}}
8branch {{=machine}} 9branch {{=machine}}
9 10
10include {{=machine}}.scc 11include {{=machine}}.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-preempt-rt.scc
index 176190c..a128255 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-preempt-rt.scc
+++ b/scripts/lib/bsp/substrate/target/arch/mips64/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
2define KMACHINE {{=machine}} 2define KMACHINE {{=machine}}
3define KTYPE preempt-rt 3
4define KARCH mips 4define KARCH mips
5 5
6include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 6include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
7{{ if need_new_kbranch == "y": }} 7{{ if need_new_kbranch == "y": }}
8define KTYPE {{=new_kbranch}}
8branch {{=machine}} 9branch {{=machine}}
9 10
10include {{=machine}}.scc 11include {{=machine}}.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-standard.scc b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-standard.scc
index f05dd85..7c9dc52 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-standard.scc
+++ b/scripts/lib/bsp/substrate/target/arch/mips64/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
2define KMACHINE {{=machine}} 2define KMACHINE {{=machine}}
3define KTYPE standard 3
4define KARCH mips 4define KARCH mips
5 5
6include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 6include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
7{{ if need_new_kbranch == "y": }} 7{{ if need_new_kbranch == "y": }}
8define KTYPE {{=new_kbranch}}
8branch {{=machine}} 9branch {{=machine}}
9 10
10include {{=machine}}.scc 11include {{=machine}}.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-tiny.scc b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-tiny.scc
index f71c775..64f395b 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine-tiny.scc
+++ b/scripts/lib/bsp/substrate/target/arch/mips64/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
2define KMACHINE {{=machine}} 2define KMACHINE {{=machine}}
3define KTYPE tiny 3
4define KARCH mips 4define KARCH mips
5 5
6include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 6include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
7{{ if need_new_kbranch == "y": }} 7{{ if need_new_kbranch == "y": }}
8define KTYPE {{=new_kbranch}}
8branch {{=machine}} 9branch {{=machine}}
9 10
10include {{=machine}}.scc 11include {{=machine}}.scc
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 40c9267..91ccfb8 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
2define KMACHINE {{=machine}} 2define KMACHINE {{=machine}}
3define KTYPE preempt-rt 3
4define KARCH powerpc 4define KARCH powerpc
5 5
6include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 6include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
7{{ if need_new_kbranch == "y": }} 7{{ if need_new_kbranch == "y": }}
8define KTYPE {{=new_kbranch}}
8branch {{=machine}} 9branch {{=machine}}
9 10
10include {{=machine}}.scc 11include {{=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 7a1d35b..89b344f 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
2define KMACHINE {{=machine}} 2define KMACHINE {{=machine}}
3define KTYPE standard 3
4define KARCH powerpc 4define KARCH powerpc
5 5
6include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 6include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
7{{ if need_new_kbranch == "y": }} 7{{ if need_new_kbranch == "y": }}
8define KTYPE {{=new_kbranch}}
8branch {{=machine}} 9branch {{=machine}}
9 10
10include {{=machine}}.scc 11include {{=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 1bf94b2..2701fd8 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
2define KMACHINE {{=machine}} 2define KMACHINE {{=machine}}
3define KTYPE tiny 3
4define KARCH powerpc 4define KARCH powerpc
5 5
6include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 6include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
7{{ if need_new_kbranch == "y": }} 7{{ if need_new_kbranch == "y": }}
8define KTYPE {{=new_kbranch}}
8branch {{=machine}} 9branch {{=machine}}
9 10
10include {{=machine}}.scc 11include {{=machine}}.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-preempt-rt.scc
index 6aaffb8..a81b858 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-preempt-rt.scc
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/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
2define KMACHINE {{=machine}} 2define KMACHINE {{=machine}}
3define KTYPE preempt-rt 3
4define KARCH {{=qemuarch}} 4define KARCH {{=qemuarch}}
5 5
6include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 6include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
7{{ if need_new_kbranch == "y": }} 7{{ if need_new_kbranch == "y": }}
8define KTYPE {{=new_kbranch}}
8branch {{=machine}} 9branch {{=machine}}
9 10
10include {{=machine}}.scc 11include {{=machine}}.scc
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 d2a03ec..14554da 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
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-tiny.scc b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-tiny.scc
index 6c098fe..41d4c6f 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine-tiny.scc
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/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
2define KMACHINE {{=machine}} 2define KMACHINE {{=machine}}
3define KTYPE tiny 3
4define KARCH {{=qemuarch}} 4define KARCH {{=qemuarch}}
5 5
6include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 6include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
7{{ if need_new_kbranch == "y": }} 7{{ if need_new_kbranch == "y": }}
8define KTYPE {{=new_kbranch}}
8branch {{=machine}} 9branch {{=machine}}
9 10
10include {{=machine}}.scc 11include {{=machine}}.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-preempt-rt.scc
index fd5320b..bbeeecd 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-preempt-rt.scc
+++ b/scripts/lib/bsp/substrate/target/arch/x86_64/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
2define KMACHINE {{=machine}} 2define KMACHINE {{=machine}}
3define KTYPE preempt-rt 3
4define KARCH x86_64 4define KARCH x86_64
5 5
6include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 6include {{=map_preempt_rt_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
7{{ if need_new_kbranch == "y": }} 7{{ if need_new_kbranch == "y": }}
8define KTYPE {{=new_kbranch}}
8branch {{=machine}} 9branch {{=machine}}
9 10
10include {{=machine}}.scc 11include {{=machine}}.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-standard.scc b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-standard.scc
index 569f967..9c9cc90 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-standard.scc
+++ b/scripts/lib/bsp/substrate/target/arch/x86_64/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
2define KMACHINE {{=machine}} 2define KMACHINE {{=machine}}
3define KTYPE standard 3
4define KARCH x86_64 4define KARCH x86_64
5 5
6include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 6include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
7{{ if need_new_kbranch == "y": }} 7{{ if need_new_kbranch == "y": }}
8define KTYPE {{=new_kbranch}}
8branch {{=machine}} 9branch {{=machine}}
9 10
10include {{=machine}}.scc 11include {{=machine}}.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-tiny.scc b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-tiny.scc
index fb21432..b53706f 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine-tiny.scc
+++ b/scripts/lib/bsp/substrate/target/arch/x86_64/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
2define KMACHINE {{=machine}} 2define KMACHINE {{=machine}}
3define KTYPE tiny 3
4define KARCH x86_64 4define KARCH x86_64
5 5
6include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} 6include {{=map_tiny_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}}
7{{ if need_new_kbranch == "y": }} 7{{ if need_new_kbranch == "y": }}
8define KTYPE {{=new_kbranch}}
8branch {{=machine}} 9branch {{=machine}}
9 10
10include {{=machine}}.scc 11include {{=machine}}.scc