[linux-yocto] [PATCH 02/19] common-pc: restrict NR_CPUS to 8

Saul Wold sgw at linux.intel.com
Fri May 8 08:34:58 PDT 2015


From: Bruce Ashfield <bruce.ashfield at windriver.com>

Since arch/x86/Kconfig has the following range restriction for NR_CPUS

  range 2 8 if SMP && X86_32 && !X86_BIGSMP

In a common-pc build, we are indeed X86_32 enabled, so 8 is our max
CPUs. To avoid a configuration warning, we change our default to this
range's max value

Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
 meta/cfg/kernel-cache/bsp/common-pc/common-pc.cfg | 9 +++++++++
 meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc | 4 ++++
 2 files changed, 13 insertions(+)
 create mode 100644 meta/cfg/kernel-cache/bsp/common-pc/common-pc.cfg

diff --git a/meta/cfg/kernel-cache/bsp/common-pc/common-pc.cfg b/meta/cfg/kernel-cache/bsp/common-pc/common-pc.cfg
new file mode 100644
index 0000000..60ac6ca
--- /dev/null
+++ b/meta/cfg/kernel-cache/bsp/common-pc/common-pc.cfg
@@ -0,0 +1,9 @@
+# We set this to 8, even though the common fragments set NR_CPUs to 64
+# Since arch/x86/Kconfig has the following range restriction for NR_CPUS
+#
+#  range 2 8 if SMP && X86_32 && !X86_BIGSMP
+#
+# In a common-pc build, we are indeed X86_32 enabled, so 8 is our max CPUs.
+# To avoid a configuration warning, we change our default to this range's max
+# value
+CONFIG_NR_CPUS=8
diff --git a/meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc b/meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc
index 3c06890..f8abc4d 100644
--- a/meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc
+++ b/meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc
@@ -21,3 +21,7 @@ include features/iwlegacy/iwlegacy.scc
 
 include features/i915/i915.scc
 include features/drm-gma500/drm-gma500.scc
+
+# This stays last in the list, since it is our final override of the
+# common fragments (if required)
+kconf hardware common-pc.cfg
-- 
2.1.0



More information about the linux-yocto mailing list