From f1fd97be551fe4ec2027cd8d17abd63c772f8305 Mon Sep 17 00:00:00 2001 From: Alejandro Hernandez Date: Tue, 30 May 2017 11:44:34 -0700 Subject: 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 Signed-off-by: Richard Purdie --- .../target/arch/qemu/recipes-kernel/linux/linux-yocto-dev.bbappend | 1 + .../target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend | 1 + .../target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend | 1 + .../target/arch/qemu/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend | 1 + .../target/arch/qemu/recipes-kernel/linux/linux-yocto_4.1.bbappend | 1 + .../target/arch/qemu/recipes-kernel/linux/linux-yocto_4.10.bbappend | 1 + .../target/arch/qemu/recipes-kernel/linux/linux-yocto_4.4.bbappend | 1 + 7 files changed, 7 insertions(+) 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}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" +{{ if qemuarch != "arm": }} {{ input type:"boolean" name:"smp" prio:"30" msg:"Would you like SMP support? (y/n)" default:"y"}} {{ if smp == "y": }} KERNEL_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}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" +{{ if qemuarch != "arm": }} {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} {{ if smp == "y": }} KERNEL_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}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" +{{ if qemuarch != "arm": }} {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} {{ if smp == "y": }} KERNEL_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}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" +{{ if qemuarch != "arm": }} {{ input type:"boolean" name:"smp" prio:"30" msg:"Do you need SMP support? (y/n)" default:"y"}} {{ if smp == "y": }} KERNEL_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}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" +{{ if qemuarch != "arm": }} {{ input type:"boolean" name:"smp" prio:"30" msg:"Would you like SMP support? (y/n)" default:"y"}} {{ if smp == "y": }} KERNEL_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}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" +{{ if qemuarch != "arm": }} {{ input type:"boolean" name:"smp" prio:"30" msg:"Would you like SMP support? (y/n)" default:"y"}} {{ if smp == "y": }} KERNEL_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}}" {{ if need_new_kbranch == "n": }} KBRANCH_{{=machine}} = "{{=existing_kbranch}}" +{{ if qemuarch != "arm": }} {{ input type:"boolean" name:"smp" prio:"30" msg:"Would you like SMP support? (y/n)" default:"y"}} {{ if smp == "y": }} KERNEL_FEATURES_append_{{=machine}} += " cfg/smp.scc" -- cgit v1.2.3-54-g00ecf