[meta-lsi] [PATCH 16/22] linux-yocto-3.14: SMP config option becomes optional

[Daniel Dragomir]

From: Cristian Bercaru <cristian.bercaru at windriver.com>

By default, the SMP Kconfig option is enabled in linux-yocto-3.14 on
Axxia platforms. However, you can disable it by adding the following
line to 'local.conf':    SMP = "no"
This patch puts the SMP option in separate kernel configuration
fragment and adds the SMP option to enable or to disable it.
SMP defaults to "yes".

Signed-off-by: Cristian Bercaru <cristian.bercaru at windriver.com>
---
 .../linux/conf/linux-yocto/linux-3.14/axxiaarm/common/smp-hw.cfg        | 1 +
 .../linux/conf/linux-yocto/linux-3.14/axxiaarm/common/smp.scc           | 1 +
 .../linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/smp-hw.cfg    | 1 +
 .../linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/smp.scc       | 1 +
 recipes-kernel/linux/frags-powerpc.inc                                  | 1 +
 recipes-kernel/linux/linux-yocto-rt_3.14.bbappend                       | 2 +-
 recipes-kernel/linux/linux-yocto_3.14.bbappend                          | 2 +-
 7 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/smp-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/smp.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/smp-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/smp.scc

diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/smp-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/smp-hw.cfg
new file mode 100644
index 0000000..1cbf7ec
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/smp-hw.cfg
@@ -0,0 +1 @@
+CONFIG_SMP=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/smp.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/smp.scc
new file mode 100644
index 0000000..c33e2da
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/smp.scc
@@ -0,0 +1 @@
+kconf hardware smp-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/smp-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/smp-hw.cfg
new file mode 100644
index 0000000..1cbf7ec
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/smp-hw.cfg
@@ -0,0 +1 @@
+CONFIG_SMP=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/smp.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/smp.scc
new file mode 100644
index 0000000..c33e2da
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/smp.scc
@@ -0,0 +1 @@
+kconf hardware smp-hw.cfg
diff --git a/recipes-kernel/linux/frags-powerpc.inc b/recipes-kernel/linux/frags-powerpc.inc
index 1726570..84f0d81 100644
--- a/recipes-kernel/linux/frags-powerpc.inc
+++ b/recipes-kernel/linux/frags-powerpc.inc
@@ -1,5 +1,6 @@
 # adding fragments with kernel options to the final .config
 SRC_URI += "file://common.scc \
+	${@base_conditional('SMP', 'yes', 'file://smp.scc', '', d)} \
 	${@base_conditional('LINUX_KERNEL_TYPE', 'preempt-rt', 'file://preempt-rt.scc', 'file://standard.scc', d)} \
 	${@base_conditional('DBG', 'yes', 'file://dbg.scc', '', d)} \
 	${@base_conditional('TESTING', 'yes', 'file://testing.scc', 'file://non-testing.scc', d)} "
diff --git a/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend b/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
index ee50a87..a9698a6 100644
--- a/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
@@ -4,8 +4,8 @@ COMPATIBLE_MACHINE = "^axxiaarm$|^axxiapowerpc$"
 INSANE_SKIP_kernel-dev = "debug-files"
 PARALLEL_MAKE = ""
 
-LINUX_KERNEL_TYPE = "preempt-rt"
 LSI_SRC ?= "linux-yocto"
+SMP ?= "yes"
 POWER_MANAGEMENT ?= "low-power"
 CHIPSET ?= "5500"
 BIG_ENDIAN ?= "no"
diff --git a/recipes-kernel/linux/linux-yocto_3.14.bbappend b/recipes-kernel/linux/linux-yocto_3.14.bbappend
index f970c0f..5eca0b5 100644
--- a/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ b/recipes-kernel/linux/linux-yocto_3.14.bbappend
@@ -4,8 +4,8 @@ COMPATIBLE_MACHINE = "^axxiaarm$|^axxiapowerpc$"
 INSANE_SKIP_kernel-dev = "debug-files"
 PARALLEL_MAKE = ""
 
-LINUX_KERNEL_TYPE = "standard"
 LSI_SRC ?= "linux-yocto"
+SMP ?= "yes"
 POWER_MANAGEMENT ?= "low-power"
 CHIPSET ?= "5500"
 BIG_ENDIAN ?= "no"
-- 
1.9.1