[meta-lsi] [PATCH 02/22] linux-yocto-3.14: axxiapowerpc: update config fragments to match github defconfigs
Daniel Dragomir
daniel.dragomir at windriver.com
Thu Jan 28 04:56:53 PST 2016
From: Cristian Bercaru <cristian.bercaru at windriver.com>
Signed-off-by: Cristian Bercaru <cristian.bercaru at windriver.com>
---
.../axxiapowerpc/common/common-non-hw.cfg | 5 ++
.../linux-3.14/axxiapowerpc/common/testing.cfg | 13 ++++
.../linux-3.14/axxiapowerpc/preempt-rt/dbg-hw.cfg | 5 --
.../axxiapowerpc/preempt-rt/dbg-non-hw.cfg | 83 +++++++++-------------
.../linux-3.14/axxiapowerpc/preempt-rt/dbg.scc | 1 -
.../axxiapowerpc/preempt-rt/preempt-rt-non-hw.cfg | 11 ---
.../linux-3.14/axxiapowerpc/standard/dbg-hw.cfg | 5 --
.../axxiapowerpc/standard/dbg-non-hw.cfg | 71 +++++++++---------
.../linux-3.14/axxiapowerpc/standard/dbg.scc | 1 -
.../axxiapowerpc/standard/standard-non-hw.cfg | 22 ++++++
.../linux-3.14/axxiapowerpc/standard/standard.scc | 1 +
11 files changed, 110 insertions(+), 108 deletions(-)
delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/dbg-hw.cfg
delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/dbg-hw.cfg
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/standard-non-hw.cfg
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/standard.scc
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 5cd1e71..377fe05 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
@@ -36,6 +36,11 @@ CONFIG_SYSCTL_SYSCALL=y
# CONFIG_KPROBES is not set
#
+# Kernel Performance Events And Counters
+#
+CONFIG_PROFILING=y
+
+#
# GCOV-based kernel profiling
#
CONFIG_MODULE_FORCE_LOAD=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/testing.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/testing.cfg
index 93e2e30..6e2af3c 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/testing.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/testing.cfg
@@ -1,3 +1,16 @@
+#.........................................................................
+# WARNING
+#
+# This file is a kernel configuration fragment, and not a full kernel
+# configuration file. The final kernel configuration is made up of
+# an assembly of processed fragments, each of which is designed to
+# capture a specific part of the final configuration (e.g. platform
+# configuration, feature configuration, and board specific hardware
+# configuration). For more information on kernel configuration, please
+# consult the product documentation.
+#
+#.........................................................................
+
CONFIG_PROC_FS=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/dbg-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/dbg-hw.cfg
deleted file mode 100644
index de5be4a..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/dbg-hw.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Kernel Features
-#
-CONFIG_PREEMPT_COUNT=y
-CONFIG_SPLIT_PTLOCK_CPUS=999999
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/dbg-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/dbg-non-hw.cfg
index c83622b..9ba0485 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/dbg-non-hw.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/dbg-non-hw.cfg
@@ -1,63 +1,50 @@
+#.........................................................................
+# WARNING
#
-# RCU Subsystem
+# This file is a kernel configuration fragment, and not a full kernel
+# configuration file. The final kernel configuration is made up of
+# an assembly of processed fragments, each of which is designed to
+# capture a specific part of the final configuration (e.g. platform
+# configuration, feature configuration, and board specific hardware
+# configuration). For more information on kernel configuration, please
+# consult the product documentation.
#
-CONFIG_TREE_RCU_TRACE=y
+#.........................................................................
#
-# Kernel hacking
+# Memory Debugging
#
-CONFIG_DEBUG_SHIRQ=y
-CONFIG_LOCKUP_DETECTOR=y
-
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
+CONFIG_DEBUG_PAGEALLOC=y
CONFIG_DEBUG_OBJECTS=y
+CONFIG_DEBUG_OBJECTS_SELFTEST=y
+CONFIG_DEBUG_OBJECTS_FREE=y
+CONFIG_DEBUG_OBJECTS_TIMERS=y
+CONFIG_DEBUG_OBJECTS_WORK=y
+CONFIG_DEBUG_OBJECTS_RCU_HEAD=y
+CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
CONFIG_SLUB_STATS=y
-CONFIG_SLUB_DEBUG_ON=y
CONFIG_DEBUG_KMEMLEAK=y
-CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_PROVE_LOCKING=y
-CONFIG_LOCK_STAT=y
-CONFIG_DEBUG_LOCKDEP=y
-CONFIG_DEBUG_ATOMIC_SLEEP=y
+CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
CONFIG_DEBUG_STACK_USAGE=y
-CONFIG_DEBUG_KOBJECT=y
-CONFIG_DEBUG_HIGHMEM=y
CONFIG_DEBUG_VM=y
CONFIG_DEBUG_VM_RB=y
-CONFIG_DEBUG_WRITECOUNT=y
CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_DEBUG_LIST=y
-CONFIG_DEBUG_SG=y
-CONFIG_DEBUG_NOTIFIERS=y
-CONFIG_DEBUG_CREDENTIALS=y
+CONFIG_DEBUG_PER_CPU_MAPS=y
+CONFIG_DEBUG_HIGHMEM=y
+CONFIG_DEBUG_STACKOVERFLOW=y
#
-# RCU Debugging
+# Debug Lockups and Hangs
#
-CONFIG_PROVE_RCU=y
-CONFIG_PROVE_RCU_DELAY=y
-CONFIG_SPARSE_RCU_POINTER=y
-CONFIG_RCU_CPU_STALL_INFO=y
-CONFIG_RCU_TRACE=y
-CONFIG_DEBUG_PER_CPU_MAPS=y
-CONFIG_LATENCYTOP=y
-CONFIG_DEBUG_PAGEALLOC=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_FTRACE=y
-CONFIG_IRQSOFF_TRACER=y
-CONFIG_INTERRUPT_OFF_HIST=y
-CONFIG_PREEMPT_TRACER=y
-CONFIG_PREEMPT_OFF_HIST=y
-CONFIG_SCHED_TRACER=y
-CONFIG_WAKEUP_LATENCY_HIST=y
-CONFIG_FTRACE_SYSCALLS=y
-CONFIG_STACK_TRACER=y
-CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_UPROBE_EVENT=y
-CONFIG_FUNCTION_PROFILER=y
-CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DMA_API_DEBUG=y
-CONFIG_DEBUG_STACKOVERFLOW=y
+CONFIG_LOCKUP_DETECTOR=y
+# CONFIG_DETECT_HUNG_TASK is not set
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+
+#
+# Lock Debugging
+#
+CONFIG_DEBUG_RT_MUTEXES=y
+CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y
+CONFIG_LOCK_STAT=y
+CONFIG_DEBUG_ATOMIC_SLEEP=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/dbg.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/dbg.scc
index b5cd0eb..01fcbff 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/dbg.scc
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/dbg.scc
@@ -1,2 +1 @@
kconf non-hardware dbg-non-hw.cfg
-kconf hardware dbg-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/preempt-rt-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/preempt-rt-non-hw.cfg
index 7811f0a..7bbd1bf 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/preempt-rt-non-hw.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/preempt-rt-non-hw.cfg
@@ -12,11 +12,6 @@
#.........................................................................
#
-# Processor support
-#
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-
-#
# RCU Subsystem
#
# CONFIG_RCU_BOOST is not set
@@ -25,9 +20,3 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
# Kernel Performance Events And Counters
#
CONFIG_SLUB_DEBUG=y
-
-#
-# IO Schedulers
-#
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/dbg-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/dbg-hw.cfg
deleted file mode 100644
index de5be4a..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/dbg-hw.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Kernel Features
-#
-CONFIG_PREEMPT_COUNT=y
-CONFIG_SPLIT_PTLOCK_CPUS=999999
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/dbg-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/dbg-non-hw.cfg
index db1afba..299d622 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/dbg-non-hw.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/dbg-non-hw.cfg
@@ -1,52 +1,49 @@
+#.........................................................................
+# WARNING
#
-# RCU Subsystem
+# This file is a kernel configuration fragment, and not a full kernel
+# configuration file. The final kernel configuration is made up of
+# an assembly of processed fragments, each of which is designed to
+# capture a specific part of the final configuration (e.g. platform
+# configuration, feature configuration, and board specific hardware
+# configuration). For more information on kernel configuration, please
+# consult the product documentation.
#
-CONFIG_TREE_RCU_TRACE=y
+#.........................................................................
#
-# Kernel hacking
+# Memory Debugging
#
-CONFIG_DEBUG_SHIRQ=y
-CONFIG_LOCKUP_DETECTOR=y
-
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
+CONFIG_DEBUG_PAGEALLOC=y
CONFIG_DEBUG_OBJECTS=y
+CONFIG_DEBUG_OBJECTS_SELFTEST=y
+CONFIG_DEBUG_OBJECTS_FREE=y
+CONFIG_DEBUG_OBJECTS_TIMERS=y
+CONFIG_DEBUG_OBJECTS_WORK=y
+CONFIG_DEBUG_OBJECTS_RCU_HEAD=y
+CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
CONFIG_SLUB_STATS=y
-
CONFIG_DEBUG_KMEMLEAK=y
-CONFIG_DEBUG_RT_MUTEXES=y
-
-CONFIG_PROVE_LOCKING=y
-CONFIG_LOCK_STAT=y
-CONFIG_DEBUG_ATOMIC_SLEEP=y
-
+CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
CONFIG_DEBUG_STACK_USAGE=y
-CONFIG_DEBUG_KOBJECT=y
-CONFIG_DEBUG_HIGHMEM=y
-
CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_WRITECOUNT=y
+CONFIG_DEBUG_VM_RB=y
CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_PER_CPU_MAPS=y
+CONFIG_DEBUG_HIGHMEM=y
+CONFIG_DEBUG_STACKOVERFLOW=y
-CONFIG_DEBUG_SG=y
-CONFIG_DEBUG_NOTIFIERS=y
-CONFIG_DEBUG_CREDENTIALS=y
+#
+# Debug Lockups and Hangs
+#
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
#
-# RCU Debugging
+# Lock Debugging
#
-CONFIG_SPARSE_RCU_POINTER=y
-CONFIG_RCU_CPU_STALL_INFO=y
-CONFIG_RCU_TRACE=y
-CONFIG_DEBUG_BLOCK_EXT_DEVT=y
-CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
-CONFIG_DEBUG_PER_CPU_MAPS=y
-CONFIG_DEBUG_PAGEALLOC=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_FTRACE=y
-CONFIG_DMA_API_DEBUG=y
-CONFIG_DEBUG_STACKOVERFLOW=y
+CONFIG_DEBUG_RT_MUTEXES=y
+CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y
+CONFIG_LOCK_STAT=y
+CONFIG_DEBUG_ATOMIC_SLEEP=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/dbg.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/dbg.scc
index b5cd0eb..01fcbff 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/dbg.scc
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/dbg.scc
@@ -1,2 +1 @@
kconf non-hardware dbg-non-hw.cfg
-kconf hardware dbg-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/standard-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/standard-non-hw.cfg
new file mode 100644
index 0000000..4995a26
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/standard-non-hw.cfg
@@ -0,0 +1,22 @@
+#.........................................................................
+# WARNING
+#
+# This file is a kernel configuration fragment, and not a full kernel
+# configuration file. The final kernel configuration is made up of
+# an assembly of processed fragments, each of which is designed to
+# capture a specific part of the final configuration (e.g. platform
+# configuration, feature configuration, and board specific hardware
+# configuration). For more information on kernel configuration, please
+# consult the product documentation.
+#
+#.........................................................................
+
+#
+# Kernel options
+#
+CONFIG_PREEMPT_NONE=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_OPROFILE=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/standard.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/standard.scc
new file mode 100644
index 0000000..609308f
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/standard.scc
@@ -0,0 +1 @@
+kconf non-hardware standard-non-hw.cfg
--
1.9.1
More information about the meta-lsi
mailing list