[meta-lsi] [PATCH 33/41] linux-yocto-3.4: 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.4 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.4/axxiaarm/common/no-smp-hw.cfg       | 1 +
 .../linux/conf/linux-yocto/linux-3.4/axxiaarm/common/no-smp.scc          | 1 +
 .../linux/conf/linux-yocto/linux-3.4/axxiaarm/common/smp-hw.cfg          | 1 +
 recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/smp.scc  | 1 +
 .../linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/no-smp.scc      | 1 +
 .../linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/smp-hw.cfg      | 1 +
 .../linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/smp.scc         | 1 +
 recipes-kernel/linux/frags-3.4.inc                                       | 1 +
 recipes-kernel/linux/linux-yocto-rt_3.4.bbappend                         | 1 +
 recipes-kernel/linux/linux-yocto_3.4.bbappend                            | 1 +
 10 files changed, 10 insertions(+)
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/no-smp-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/no-smp.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/smp-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/smp.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/no-smp.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/smp-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/smp.scc

diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/no-smp-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/no-smp-hw.cfg
new file mode 100644
index 0000000..74b49fd
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/no-smp-hw.cfg
@@ -0,0 +1 @@
+CONFIG_SWP_EMULATE=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/no-smp.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/no-smp.scc
new file mode 100644
index 0000000..0134983
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/no-smp.scc
@@ -0,0 +1 @@
+kconf hardware no-smp-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/smp-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/smp-hw.cfg
new file mode 100644
index 0000000..1cbf7ec
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/smp-hw.cfg
@@ -0,0 +1 @@
+CONFIG_SMP=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/smp.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/smp.scc
new file mode 100644
index 0000000..c33e2da
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiaarm/common/smp.scc
@@ -0,0 +1 @@
+kconf hardware smp-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/no-smp.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/no-smp.scc
new file mode 100644
index 0000000..40632d0
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/no-smp.scc
@@ -0,0 +1 @@
+# Just keeping compatibility with linux 3.4 arm fragments.
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/smp-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/smp-hw.cfg
new file mode 100644
index 0000000..1cbf7ec
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/smp-hw.cfg
@@ -0,0 +1 @@
+CONFIG_SMP=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/smp.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/smp.scc
new file mode 100644
index 0000000..c33e2da
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.4/axxiapowerpc/common/smp.scc
@@ -0,0 +1 @@
+kconf hardware smp-hw.cfg
diff --git a/recipes-kernel/linux/frags-3.4.inc b/recipes-kernel/linux/frags-3.4.inc
index b3d91d2..0077af1 100644
--- a/recipes-kernel/linux/frags-3.4.inc
+++ b/recipes-kernel/linux/frags-3.4.inc
@@ -1,4 +1,5 @@
 # adding fragments with kernel options to the final .config
 SRC_URI += "file://common.scc \
+	${@base_conditional('SMP', 'yes', 'file://smp.scc', 'file://no-smp.scc', d)} \
 	${@base_conditional('LINUX_KERNEL_TYPE', 'preempt-rt', '', 'file://standard.scc', d)} \
 	${@base_conditional('TESTING', 'yes', 'file://testing.scc', '', d)} "
diff --git a/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
index 17ae806..c101eee 100644
--- a/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
@@ -5,6 +5,7 @@ INSANE_SKIP_kernel-dev = "debug-files"
 PARALLEL_MAKE = ""
 
 LSI_SRC ?= "linux-yocto"
+SMP ?= "yes"
 TESTING ?= "no"
 KV = "3.4"
 KERNEL_EXTRA_FEATURES = ""
diff --git a/recipes-kernel/linux/linux-yocto_3.4.bbappend b/recipes-kernel/linux/linux-yocto_3.4.bbappend
index a2ec127..519c6b0 100644
--- a/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -5,6 +5,7 @@ INSANE_SKIP_kernel-dev = "debug-files"
 PARALLEL_MAKE = ""
 
 LSI_SRC ?= "linux-yocto"
+SMP ?= "yes"
 TESTING ?= "no"
 KV = "3.4"
 KERNEL_EXTRA_FEATURES = ""
-- 
1.9.1