summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAlejandro Hernandez <alejandro.hernandez@linux.intel.com>2017-05-30 11:44:34 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-09 17:13:45 +0100
commitf1fd97be551fe4ec2027cd8d17abd63c772f8305 (patch)
treee119baa96567fdb4514b688c72cd091f92c8b48e /scripts
parent337bea6573db8ca23ba634406d1047264bc024ed (diff)
downloadpoky-f1fd97be551fe4ec2027cd8d17abd63c772f8305.tar.gz
yocto-bsp: Fix QEMUARM based bsps to not offer SMP support
The SMP kernel config presents issues on qemuarm because: CONFIG_SMP=y Dependencies Missing: - CPU_V6K or CPU_V7: These are selected by setting: CONFIG_ARCH_MULTI_V7=y or CONFIG_ARCH_MULTI_V6=y But our QEMU + ARM BSPs are based on armv4/v5 hence they are incompatible with CONFIG_SMP. This patch fixes the script, and avoids offering SMP to the user when the created BSP is based on QEMU + ARM. [YOCTO #11426] (From meta-yocto rev: d63aa4acd20b2aa022701289e9ab7be7f551b0b2) Signed-off-by: Alejandro Hernandez <alejandro.hernandez@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/qemu/recipes-kernel/linux/linux-yocto-dev.bbappend1
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend1
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend1
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend1
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.1.bbappend1
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.10.bbappend1
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.4.bbappend1
7 files changed, 7 insertions, 0 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-dev.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-dev.bbappend
index 7e3ce5ba12..11105ebcc2 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -45,6 +45,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
45{{ if need_new_kbranch == "n": }} 45{{ if need_new_kbranch == "n": }}
46KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 46KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
47 47
48{{ if qemuarch != "arm": }}
48{{ input type:"boolean" name:"smp" prio:"30" msg:"Would you like SMP support? (y/n)" default:"y"}} 49{{ input type:"boolean" name:"smp" prio:"30" msg:"Would you like SMP support? (y/n)" default:"y"}}
49{{ if smp == "y": }} 50{{ if smp == "y": }}
50KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" 51KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
index 81392ce38a..ad77a66268 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend
@@ -45,6 +45,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
45{{ if need_new_kbranch == "n": }} 45{{ if need_new_kbranch == "n": }}
46KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 46KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
47 47
48{{ if qemuarch != "arm": }}
48{{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} 49{{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}}
49{{ if smp == "y": }} 50{{ if smp == "y": }}
50KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" 51KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend
index 29ad17b200..9b5f801684 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend
@@ -45,6 +45,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
45{{ if need_new_kbranch == "n": }} 45{{ if need_new_kbranch == "n": }}
46KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 46KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
47 47
48{{ if qemuarch != "arm": }}
48{{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} 49{{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}}
49{{ if smp == "y": }} 50{{ if smp == "y": }}
50KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" 51KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend
index a73b1aa132..2fc992992c 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend
@@ -45,6 +45,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
45{{ if need_new_kbranch == "n": }} 45{{ if need_new_kbranch == "n": }}
46KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 46KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
47 47
48{{ if qemuarch != "arm": }}
48{{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} 49{{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}}
49{{ if smp == "y": }} 50{{ if smp == "y": }}
50KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" 51KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.1.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.1.bbappend
index a9fd9ecff5..13450f4743 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.1.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.1.bbappend
@@ -45,6 +45,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
45{{ if need_new_kbranch == "n": }} 45{{ if need_new_kbranch == "n": }}
46KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 46KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
47 47
48{{ if qemuarch != "arm": }}
48{{ input type:"boolean" name:"smp" prio:"30" msg:"Would you like SMP support? (y/n)" default:"y"}} 49{{ input type:"boolean" name:"smp" prio:"30" msg:"Would you like SMP support? (y/n)" default:"y"}}
49{{ if smp == "y": }} 50{{ if smp == "y": }}
50KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" 51KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.10.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.10.bbappend
index 5873da4245..e1af4976fc 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.10.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.10.bbappend
@@ -45,6 +45,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
45{{ if need_new_kbranch == "n": }} 45{{ if need_new_kbranch == "n": }}
46KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 46KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
47 47
48{{ if qemuarch != "arm": }}
48{{ input type:"boolean" name:"smp" prio:"30" msg:"Would you like SMP support? (y/n)" default:"y"}} 49{{ input type:"boolean" name:"smp" prio:"30" msg:"Would you like SMP support? (y/n)" default:"y"}}
49{{ if smp == "y": }} 50{{ if smp == "y": }}
50KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" 51KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.4.bbappend b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.4.bbappend
index cdee773798..a2511ba197 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.4.bbappend
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/linux-yocto_4.4.bbappend
@@ -45,6 +45,7 @@ COMPATIBLE_MACHINE_{{=machine}} = "{{=machine}}"
45{{ if need_new_kbranch == "n": }} 45{{ if need_new_kbranch == "n": }}
46KBRANCH_{{=machine}} = "{{=existing_kbranch}}" 46KBRANCH_{{=machine}} = "{{=existing_kbranch}}"
47 47
48{{ if qemuarch != "arm": }}
48{{ input type:"boolean" name:"smp" prio:"30" msg:"Would you like SMP support? (y/n)" default:"y"}} 49{{ input type:"boolean" name:"smp" prio:"30" msg:"Would you like SMP support? (y/n)" default:"y"}}
49{{ if smp == "y": }} 50{{ if smp == "y": }}
50KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" 51KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc"