[meta-lsi] [PATCH 10/24] linux-yocto-3.14: axxiaarm: config files update

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


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

Update config fragments and defconfigs so no user interaction is
needed.

Signed-off-by: Cristian Bercaru <cristian.bercaru at windriver.com>
---
 .../axxiapowerpc/common/common-non-hw.cfg          |  1 -
 .../linux-3.14/axxiapowerpc/common/non-testing.cfg |  5 ----
 .../linux-3.14/axxiapowerpc/preempt-rt/defconfig   | 28 ++++++++++++----------
 .../linux-3.14/axxiapowerpc/standard/defconfig     | 10 +++++---
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/common-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/common-non-hw.cfg
index bf91365..5cd1e71 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/common-non-hw.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/common-non-hw.cfg
@@ -111,7 +111,6 @@ CONFIG_NETFILTER=y
 #
 # Device Tree and Open Firmware support
 #
-# CONFIG_BLK_DEV_LOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
 
 #
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/non-testing.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/non-testing.cfg
index ef58b5f..99c52d7 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/non-testing.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/non-testing.cfg
@@ -2,8 +2,3 @@
 # Timers subsystem
 #
 # CONFIG_HIGH_RES_TIMERS is not set
-
-#
-# RCU Subsystem
-#
-# CONFIG_IKCONFIG is not set
diff --git a/recipes-kernel/linux/conf/lsi-tip/linux-3.14/axxiapowerpc/preempt-rt/defconfig b/recipes-kernel/linux/conf/lsi-tip/linux-3.14/axxiapowerpc/preempt-rt/defconfig
index fbb7197..f9a1113 100644
--- a/recipes-kernel/linux/conf/lsi-tip/linux-3.14/axxiapowerpc/preempt-rt/defconfig
+++ b/recipes-kernel/linux/conf/lsi-tip/linux-3.14/axxiapowerpc/preempt-rt/defconfig
@@ -42,7 +42,7 @@ CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_LOCKBREAK=y
 CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
@@ -135,7 +135,8 @@ CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_RCU_BOOST is not set
 # CONFIG_RCU_NOCB_CPU is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_CGROUPS is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
@@ -184,13 +185,10 @@ CONFIG_PERF_EVENTS=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
 CONFIG_COMPAT_BRK=y
-# CONFIG_SLAB is not set
 CONFIG_SLUB=y
-# CONFIG_SLOB is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 CONFIG_PROFILING=y
-# CONFIG_OPROFILE is not set
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
 # CONFIG_JUMP_LABEL is not set
@@ -259,11 +257,10 @@ CONFIG_IOSCHED_CFQ=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
 # CONFIG_FREEZER is not set
 CONFIG_LSI_PPC_PCI=y
+CONFIG_LSI_PPC_PCI_MSI=y
 CONFIG_PPC4xx_PCI_EXPRESS=y
 # CONFIG_PPC4xx_MSI is not set
 CONFIG_PPC_MSI_BITMAP=y
@@ -341,16 +338,21 @@ CONFIG_MPIC=y
 #
 # Kernel options
 #
-# CONFIG_HIGHMEM is not set
 CONFIG_HZ_100=y
 # CONFIG_HZ_250 is not set
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=100
 # CONFIG_SCHED_HRTICK is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_RT_BASE=y
+CONFIG_HAVE_PREEMPT_LAZY=y
+CONFIG_PREEMPT_LAZY=y
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
+# CONFIG_PREEMPT__LL is not set
+# CONFIG_PREEMPT_RTB is not set
+CONFIG_PREEMPT_RT_FULL=y
 CONFIG_PREEMPT_COUNT=y
 CONFIG_BINFMT_ELF=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@ -780,7 +782,9 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=y
 # CONFIG_BLK_DEV_DRBD is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_NVME is not set
@@ -960,7 +964,6 @@ CONFIG_MD_RAID10=y
 # CONFIG_MD_RAID456 is not set
 CONFIG_MD_MULTIPATH=y
 CONFIG_MD_FAULTY=y
-# CONFIG_BCACHE is not set
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=y
 # CONFIG_DM_DEBUG is not set
@@ -1434,7 +1437,7 @@ CONFIG_I2C_ALGOBIT=y
 #
 # Other I2C/SMBus bus drivers
 #
-# CONFIG_I2C_AXXIA is not set
+CONFIG_I2C_AXXIA=y
 CONFIG_ACP3400_I2C=y
 # CONFIG_I2C_STUB is not set
 CONFIG_I2C_DEBUG_CORE=y
@@ -2193,7 +2196,6 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_DEBUG_SHIRQ is not set
 
 #
 # Debug Lockups and Hangs
diff --git a/recipes-kernel/linux/conf/lsi-tip/linux-3.14/axxiapowerpc/standard/defconfig b/recipes-kernel/linux/conf/lsi-tip/linux-3.14/axxiapowerpc/standard/defconfig
index fa61aaf..aca20e7 100644
--- a/recipes-kernel/linux/conf/lsi-tip/linux-3.14/axxiapowerpc/standard/defconfig
+++ b/recipes-kernel/linux/conf/lsi-tip/linux-3.14/axxiapowerpc/standard/defconfig
@@ -133,7 +133,8 @@ CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_RCU_FANOUT_EXACT is not set
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_RCU_NOCB_CPU is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_CGROUPS is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
@@ -265,6 +266,7 @@ CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 # CONFIG_FREEZER is not set
 CONFIG_LSI_PPC_PCI=y
+CONFIG_LSI_PPC_PCI_MSI=y
 CONFIG_PPC4xx_PCI_EXPRESS=y
 # CONFIG_PPC4xx_MSI is not set
 CONFIG_PPC_MSI_BITMAP=y
@@ -780,7 +782,9 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=y
 # CONFIG_BLK_DEV_DRBD is not set
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_NVME is not set
@@ -1434,7 +1438,7 @@ CONFIG_I2C_ALGOBIT=y
 #
 # Other I2C/SMBus bus drivers
 #
-# CONFIG_I2C_AXXIA is not set
+CONFIG_I2C_AXXIA=y
 CONFIG_ACP3400_I2C=y
 # CONFIG_I2C_STUB is not set
 CONFIG_I2C_DEBUG_CORE=y
-- 
1.9.1



More information about the meta-lsi mailing list