[meta-lsi] [PATCH 20/41] remove crc32c options from linux 3.10 defconfigs

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

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

Remove the following options from 3.10 defconfigs
  CONFIG_LIBCRC32C
  CONFIG_CRYPTO_CRC32C
as they cause module packaging errors.

Signed-off-by: Cristian Bercaru <cristian.bercaru at windriver.com>
---
 .../conf/lsi-public/linux-3.10/axxiaarm/preempt-rt/defconfig     | 1 -
 .../linux/conf/lsi-public/linux-3.10/axxiaarm/standard/defconfig | 1 -
 .../conf/lsi-public/linux-3.10/axxiapowerpc/preempt-rt/defconfig | 2 --
 .../conf/lsi-public/linux-3.10/axxiapowerpc/standard/defconfig   | 2 --
 .../linux/conf/lsi-tip/linux-3.10/axxiaarm/preempt-rt/defconfig  | 9 ++++++---
 .../linux/conf/lsi-tip/linux-3.10/axxiaarm/standard/defconfig    | 5 +++--
 .../conf/lsi-tip/linux-3.10/axxiapowerpc/preempt-rt/defconfig    | 9 +++++----
 .../conf/lsi-tip/linux-3.10/axxiapowerpc/standard/defconfig      | 5 ++---
 8 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiaarm/preempt-rt/defconfig b/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiaarm/preempt-rt/defconfig
index 4ca7ff1..bc770bc 100644
--- a/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiaarm/preempt-rt/defconfig
+++ b/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiaarm/preempt-rt/defconfig
@@ -2618,7 +2618,6 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
 # CONFIG_CRC8 is not set
 CONFIG_AUDIT_GENERIC=y
 CONFIG_ZLIB_INFLATE=y
diff --git a/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiaarm/standard/defconfig b/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiaarm/standard/defconfig
index 3710a31..56288f6 100644
--- a/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiaarm/standard/defconfig
+++ b/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiaarm/standard/defconfig
@@ -2622,7 +2622,6 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
 # CONFIG_CRC8 is not set
 CONFIG_AUDIT_GENERIC=y
 CONFIG_ZLIB_INFLATE=y
diff --git a/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiapowerpc/preempt-rt/defconfig b/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiapowerpc/preempt-rt/defconfig
index ef902f7..2bc8382 100644
--- a/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiapowerpc/preempt-rt/defconfig
+++ b/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiapowerpc/preempt-rt/defconfig
@@ -2038,7 +2038,6 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
 # CONFIG_CRC8 is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
@@ -2249,7 +2248,6 @@ CONFIG_CRYPTO_XCBC=y
 #
 # Digest
 #
-# CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CRC32 is not set
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_MD4 is not set
diff --git a/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiapowerpc/standard/defconfig b/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiapowerpc/standard/defconfig
index c319851..1f4a6e3 100644
--- a/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiapowerpc/standard/defconfig
+++ b/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiapowerpc/standard/defconfig
@@ -2040,7 +2040,6 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
 # CONFIG_CRC8 is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
@@ -2253,7 +2252,6 @@ CONFIG_CRYPTO_XCBC=y
 #
 # Digest
 #
-# CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CRC32 is not set
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_MD4 is not set
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 4ca7ff1..3c59e34 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
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.10.38-ltsi Kernel Configuration
+# Linux/arm 3.10.65 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -96,7 +96,9 @@ CONFIG_RCU_FANOUT=32
 CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_RCU_FANOUT_EXACT is not set
 # CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_RCU_BOOST is not set
+CONFIG_RCU_BOOST=y
+CONFIG_RCU_BOOST_PRIO=1
+CONFIG_RCU_BOOST_DELAY=500
 # CONFIG_RCU_NOCB_CPU is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
@@ -235,6 +237,7 @@ CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 # CONFIG_FREEZER is not set
 
 #
@@ -1605,6 +1608,7 @@ CONFIG_SENSORS_JC42=y
 # CONFIG_SENSORS_MAX6697 is not set
 # CONFIG_SENSORS_MCP3021 is not set
 # CONFIG_SENSORS_NCT6775 is not set
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_PCF8591 is not set
@@ -2618,7 +2622,6 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
 # CONFIG_CRC8 is not set
 CONFIG_AUDIT_GENERIC=y
 CONFIG_ZLIB_INFLATE=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 3710a31..c57df95 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
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.10.38-ltsi Kernel Configuration
+# Linux/arm 3.10.65 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -243,6 +243,7 @@ CONFIG_INLINE_READ_UNLOCK=y
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
 CONFIG_INLINE_WRITE_UNLOCK=y
 CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 # CONFIG_FREEZER is not set
 
@@ -1609,6 +1610,7 @@ CONFIG_SENSORS_JC42=y
 # CONFIG_SENSORS_MAX6697 is not set
 # CONFIG_SENSORS_MCP3021 is not set
 # CONFIG_SENSORS_NCT6775 is not set
+# CONFIG_SENSORS_NTC_THERMISTOR is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_PCF8591 is not set
@@ -2622,7 +2624,6 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
 # CONFIG_CRC8 is not set
 CONFIG_AUDIT_GENERIC=y
 CONFIG_ZLIB_INFLATE=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 ef902f7..e1c4f37 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
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.10.38-ltsi Kernel Configuration
+# Linux/powerpc 3.10.65 Kernel Configuration
 #
 # CONFIG_PPC64 is not set
 
@@ -130,7 +130,9 @@ CONFIG_RCU_FANOUT=32
 CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_RCU_FANOUT_EXACT is not set
 # CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_RCU_BOOST is not set
+CONFIG_RCU_BOOST=y
+CONFIG_RCU_BOOST_PRIO=1
+CONFIG_RCU_BOOST_DELAY=500
 # CONFIG_RCU_NOCB_CPU is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
@@ -249,6 +251,7 @@ CONFIG_IOSCHED_CFQ=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 # CONFIG_FREEZER is not set
 CONFIG_LSI_PPC_PCI=y
 CONFIG_PPC4xx_PCI_EXPRESS=y
@@ -2038,7 +2041,6 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
 # CONFIG_CRC8 is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
@@ -2249,7 +2251,6 @@ CONFIG_CRYPTO_XCBC=y
 #
 # Digest
 #
-# CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CRC32 is not set
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_MD4 is not set
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 c319851..4792397 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
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.10.38-ltsi Kernel Configuration
+# Linux/powerpc 3.10.65 Kernel Configuration
 #
 # CONFIG_PPC64 is not set
 
@@ -254,6 +254,7 @@ CONFIG_INLINE_READ_UNLOCK=y
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
 CONFIG_INLINE_WRITE_UNLOCK=y
 CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 # CONFIG_FREEZER is not set
 CONFIG_LSI_PPC_PCI=y
@@ -2040,7 +2041,6 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
 # CONFIG_CRC8 is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
@@ -2253,7 +2253,6 @@ CONFIG_CRYPTO_XCBC=y
 #
 # Digest
 #
-# CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CRC32 is not set
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_MD4 is not set
-- 
1.9.1

More information about the meta-lsi mailing list