[meta-lsi] [PATCH 26/41] linux-yocto-3.10: SMP config option becomes optional

Daniel Dragomir daniel.dragomir at windriver.com
Thu Jan 28 04:29:29 PST 2016 

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

By default, the SMP Kconfig option is enabled in linux-yocto-3.10 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.10/axxiaarm/common/common-non-hw.cfg | 1 -
 .../linux/conf/linux-yocto/linux-3.10/axxiaarm/common/no-smp-hw.cfg     | 1 +
 .../linux/conf/linux-yocto/linux-3.10/axxiaarm/common/no-smp.scc        | 1 +
 .../linux/conf/linux-yocto/linux-3.10/axxiaarm/common/smp-hw.cfg        | 1 +
 .../linux/conf/linux-yocto/linux-3.10/axxiaarm/common/smp.scc           | 1 +
 .../conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-non-hw.cfg   | 1 -
 .../linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/smp-hw.cfg    | 1 +
 .../linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/smp.scc       | 1 +
 .../linux/conf/lsi-tip/linux-3.10/axxiaarm/preempt-rt/defconfig         | 2 +-
 .../linux/conf/lsi-tip/linux-3.10/axxiaarm/standard/defconfig           | 2 +-
 .../linux/conf/lsi-tip/linux-3.10/axxiapowerpc/preempt-rt/defconfig     | 2 +-
 .../linux/conf/lsi-tip/linux-3.10/axxiapowerpc/standard/defconfig       | 2 +-
 recipes-kernel/linux/frags-arm.inc                                      | 1 +
 recipes-kernel/linux/frags-powerpc.inc                                  | 1 +
 recipes-kernel/linux/linux-yocto-rt_3.10.bbappend                       | 1 +
 recipes-kernel/linux/linux-yocto_3.10.bbappend                          | 1 +
 16 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/no-smp-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/no-smp.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/smp-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/smp.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/smp-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/smp.scc

diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common-non-hw.cfg
index 3a22a93..5ac410b 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common-non-hw.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common-non-hw.cfg
@@ -14,7 +14,6 @@
 #
 # General setup
 #
-CONFIG_LOCALVERSION_AUTO=y
 CONFIG_AUDIT=y
 
 #
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/no-smp-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/no-smp-hw.cfg
new file mode 100644
index 0000000..74b49fd
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/no-smp-hw.cfg
@@ -0,0 +1 @@
+CONFIG_SWP_EMULATE=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/no-smp.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/no-smp.scc
new file mode 100644
index 0000000..0134983
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/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.10/axxiaarm/common/smp-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/smp-hw.cfg
new file mode 100644
index 0000000..1cbf7ec
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/smp-hw.cfg
@@ -0,0 +1 @@
+CONFIG_SMP=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/smp.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/smp.scc
new file mode 100644
index 0000000..c33e2da
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/smp.scc
@@ -0,0 +1 @@
+kconf hardware smp-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-non-hw.cfg
index 3e3f452..02e32f6 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-non-hw.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-non-hw.cfg
@@ -15,7 +15,6 @@
 # General setup
 #
 CONFIG_CROSS_COMPILE="powerpc-linux-"
-CONFIG_LOCALVERSION_AUTO=y
 # CONFIG_FHANDLE is not set
 
 #
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/smp-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/smp-hw.cfg
new file mode 100644
index 0000000..1cbf7ec
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/smp-hw.cfg
@@ -0,0 +1 @@
+CONFIG_SMP=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/smp.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/smp.scc
new file mode 100644
index 0000000..c33e2da
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/smp.scc
@@ -0,0 +1 @@
+kconf hardware smp-hw.cfg
diff --git a/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiaarm/preempt-rt/defconfig b/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiaarm/preempt-rt/defconfig
index aa79aed..7bcb544 100644
--- a/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiaarm/preempt-rt/defconfig
+++ b/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiaarm/preempt-rt/defconfig
@@ -27,7 +27,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
diff --git a/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiaarm/standard/defconfig b/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiaarm/standard/defconfig
index 9d0e683..485d899 100644
--- a/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiaarm/standard/defconfig
+++ b/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiaarm/standard/defconfig
@@ -27,7 +27,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
diff --git a/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiapowerpc/preempt-rt/defconfig b/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiapowerpc/preempt-rt/defconfig
index ebe2145..2b76290 100644
--- a/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiapowerpc/preempt-rt/defconfig
+++ b/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiapowerpc/preempt-rt/defconfig
@@ -78,7 +78,7 @@ CONFIG_IRQ_WORK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE="powerpc-linux-"
 CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
diff --git a/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiapowerpc/standard/defconfig b/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiapowerpc/standard/defconfig
index 72e2413..571a697 100644
--- a/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiapowerpc/standard/defconfig
+++ b/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiapowerpc/standard/defconfig
@@ -77,7 +77,7 @@ CONFIG_IRQ_WORK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE="powerpc-linux-"
 CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
diff --git a/recipes-kernel/linux/frags-arm.inc b/recipes-kernel/linux/frags-arm.inc
index f76b463..017adbc 100644
--- a/recipes-kernel/linux/frags-arm.inc
+++ b/recipes-kernel/linux/frags-arm.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', 'file://no-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-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.10.bbappend b/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
index bebe679..4da2ce2 100644
--- a/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
@@ -5,6 +5,7 @@ INSANE_SKIP_kernel-dev = "debug-files"
 PARALLEL_MAKE = ""
 
 LSI_SRC ?= "linux-yocto"
+SMP ?= "yes"
 POWER_MANAGEMENT ?= "low-power"
 BIG_ENDIAN ?= "no"
 DBG ?= "no"
diff --git a/recipes-kernel/linux/linux-yocto_3.10.bbappend b/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 19913fb..ca5bda2 100644
--- a/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -5,6 +5,7 @@ INSANE_SKIP_kernel-dev = "debug-files"
 PARALLEL_MAKE = ""
 
 LSI_SRC ?= "linux-yocto"
+SMP ?= "yes"
 POWER_MANAGEMENT ?= "low-power"
 BIG_ENDIAN ?= "no"
 DBG ?= "no"
-- 
1.9.1

More information about the meta-lsi mailing list