[meta-lsi] [PATCH 12/22] linux-yocto-4.1: 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-4.1 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-4.1/axxiaarm/common/smp-hw.cfg         | 1 +
 recipes-kernel/linux/conf/linux-yocto/linux-4.1/axxiaarm/common/smp.scc | 1 +
 .../linux/conf/linux-yocto/linux-4.1/axxiaarm64/common/smp-hw.cfg       | 1 +
 .../linux/conf/linux-yocto/linux-4.1/axxiaarm64/common/smp.scc          | 1 +
 recipes-kernel/linux/frags-arm.inc                                      | 2 +-
 recipes-kernel/linux/frags-arm64.inc                                    | 2 +-
 recipes-kernel/linux/linux-yocto-rt_4.1.bbappend                        | 2 +-
 recipes-kernel/linux/linux-yocto_4.1.bbappend                           | 2 +-
 8 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-4.1/axxiaarm/common/smp-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-4.1/axxiaarm/common/smp.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-4.1/axxiaarm64/common/smp-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-4.1/axxiaarm64/common/smp.scc

diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-4.1/axxiaarm/common/smp-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-4.1/axxiaarm/common/smp-hw.cfg
new file mode 100644
index 0000000..1cbf7ec
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-4.1/axxiaarm/common/smp-hw.cfg
@@ -0,0 +1 @@
+CONFIG_SMP=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-4.1/axxiaarm/common/smp.scc b/recipes-kernel/linux/conf/linux-yocto/linux-4.1/axxiaarm/common/smp.scc
new file mode 100644
index 0000000..c33e2da
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-4.1/axxiaarm/common/smp.scc
@@ -0,0 +1 @@
+kconf hardware smp-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-4.1/axxiaarm64/common/smp-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-4.1/axxiaarm64/common/smp-hw.cfg
new file mode 100644
index 0000000..1cbf7ec
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-4.1/axxiaarm64/common/smp-hw.cfg
@@ -0,0 +1 @@
+CONFIG_SMP=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-4.1/axxiaarm64/common/smp.scc b/recipes-kernel/linux/conf/linux-yocto/linux-4.1/axxiaarm64/common/smp.scc
new file mode 100644
index 0000000..c33e2da
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-4.1/axxiaarm64/common/smp.scc
@@ -0,0 +1 @@
+kconf hardware smp-hw.cfg
diff --git a/recipes-kernel/linux/frags-arm.inc b/recipes-kernel/linux/frags-arm.inc
index 648a32b..c66f016 100644
--- a/recipes-kernel/linux/frags-arm.inc
+++ b/recipes-kernel/linux/frags-arm.inc
@@ -1,6 +1,6 @@
 # adding fragments with kernel options to the final .config
-KERNEL_EXTRA_FEATURES = "features/taskstats/taskstats.scc"
 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('BIG_ENDIAN', 'yes', 'file://big-endian.scc', '', d)} \
 	${@base_conditional('DBG', 'yes', 'file://dbg.scc', '', d)} \
diff --git a/recipes-kernel/linux/frags-arm64.inc b/recipes-kernel/linux/frags-arm64.inc
index 88c3584..a39d409 100644
--- a/recipes-kernel/linux/frags-arm64.inc
+++ b/recipes-kernel/linux/frags-arm64.inc
@@ -1,6 +1,6 @@
 # adding fragments with kernel options to the final .config
-KERNEL_EXTRA_FEATURES = "features/taskstats/taskstats.scc"
 SRC_URI += "file://common.scc \
+	${@base_conditional('SMP', 'yes', 'file://smp.scc', '', d)} \
 	${@base_conditional('LINUX_KERNEL_TYPE', 'preempt-rt', 'file://preempt-rt.scc', '', d)} \
 	${@base_conditional('DBG', 'yes', 'file://dbg.scc', '', d)} \
 	${@base_conditional('TESTING', 'yes', 'file://testing.scc', '', d)} "
diff --git a/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend b/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend
index dcbd9e0..186b834 100644
--- a/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_4.1.bbappend
@@ -4,8 +4,8 @@ COMPATIBLE_MACHINE = "^axxiaarm$|^axxiaarm64$"
 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_4.1.bbappend b/recipes-kernel/linux/linux-yocto_4.1.bbappend
index c25c5a3..94c3385 100644
--- a/recipes-kernel/linux/linux-yocto_4.1.bbappend
+++ b/recipes-kernel/linux/linux-yocto_4.1.bbappend
@@ -4,8 +4,8 @@ COMPATIBLE_MACHINE = "^axxiaarm$|^axxiaarm64$"
 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